From a3939cf2ea7ea8e125d292fedd56c8c7f3cfb68d Mon Sep 17 00:00:00 2001 From: MrGeorgen Date: Sun, 6 Dec 2020 14:01:34 +0100 Subject: [PATCH] baum --- src/main.go | 63 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/src/main.go b/src/main.go index e012f63..64fa8d9 100644 --- a/src/main.go +++ b/src/main.go @@ -22,7 +22,10 @@ import ( ) var discord *discordgo.Session var secret secrets_json +var config config_json var cacheAccounts hashmap.HashMap +var db *sql.DB +var giteaClient *gitea.Client type account struct { email string username string @@ -55,10 +58,11 @@ type secrets_json struct { MoodleToken string `json:"moodleToken"` GiteaToken string `json:"giteaToken"` } +type config_json struct { + CreateGiteaAccount bool `json:"createGiteaAccount"` +} func main() { - var newRbuMember *discordgo.Member - var dmChannel *discordgo.Channel var err error var jsonfile *os.File jsonfile, err = os.Open("secrets.json") @@ -69,23 +73,28 @@ func main() { err = json.Unmarshal(jsondata, &secret) log(err) jsonfile.Close() + jsonfile, err = os.Open("config.json") + log(err) + jsondata, err = ioutil.ReadAll(jsonfile) + log(err) + err = json.Unmarshal(jsondata, &config) discordgo.MakeIntent(discordgo.IntentsAll) discord, err = discordgo.New("Bot " + secret.DiscordToken) log(err) err = discord.Open() log(err) - db, err := sql.Open("mysql", secret.MysqlIndentify) + db, err = sql.Open("mysql", secret.MysqlIndentify) log(err) _, err = db.Exec("CREATE TABLE IF NOT EXISTS account(" + "username varchar(40) NOT NULL, " + "email varchar(255) NOT NULL, " + "hash TINYBLOB NOT NULL, " + "salt TINYBLOB NOT NULL, " + - "discordUsername varchar(32) NOT NULL, " + + "discordUserId varchar(32) NOT NULL, " + "PRIMARY KEY ( username )" + ");") log(err) - giteaClient, err := gitea.NewClient("https://git.redstoneunion.de", gitea.SetToken(secret.GiteaToken)) + giteaClient, err = gitea.NewClient("https://git.redstoneunion.de", gitea.SetToken(secret.GiteaToken)) log(err) moodle := moodle.NewMoodleApi("https://exam.redstoneunion.de/", secret.MoodleToken) _ = moodle @@ -94,23 +103,24 @@ func main() { remail := regexp2.MustCompile("^(?=.{0,255}$)(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])$", 0) rusername := regexp.MustCompile("^([[:lower:]]|\\d|_|-|\\.){1,40}$") rpassword := regexp2.MustCompile("^(?=.{8,255}$)(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*\\W).*$", 0) - http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + http.HandleFunc("/register", func(w http.ResponseWriter, r *http.Request) { registerstruct := registertmpl{} if r.Method == http.MethodPost { var newAccount account + var newRbuMember *discordgo.Member var split = strings.Split(r.FormValue("discordUser"), "#") + newAccount = account{ + email: r.FormValue("email"), + username: r.FormValue("username"), + password: r.FormValue("password"), + } if len(split) == 2 { - newAccount = account{ - email: r.FormValue("email"), - username: r.FormValue("username"), - password: r.FormValue("password"), - discordUsername: split[0], - discordTag: split[1], - } + newAccount.discordUsername = split[0] + newAccount.discordTag = split[1] } registerstruct.WrongAccount.Email, _ = remail.MatchString(newAccount.email) registerstruct.WrongAccount.Email = !registerstruct.WrongAccount.Email - registerstruct.WrongAccount.User = !rusername.MatchString(newAccount.username) || strings.Contains(newAccount.username, "\"") + registerstruct.WrongAccount.User = !rusername.MatchString(newAccount.username) registerstruct.WrongAccount.Pass, _ = rpassword.MatchString(newAccount.password) registerstruct.WrongAccount.Pass = !registerstruct.WrongAccount.Pass newRbuMember, registerstruct.WrongAccount.DiscordUser = getRbuMember(newAccount.discordUsername, newAccount.discordTag) @@ -122,7 +132,7 @@ func main() { { var username string registerstruct.AlreadyEsitsInDatabase.Username = db.QueryRow("select username from account where username = ?", newAccount.username).Scan(&username) == nil || UsernameExistsInMem(newAccount.username) // check if username exits - registerstruct.AlreadyEsitsInDatabase.DiscordUsername = db.QueryRow("select username from account where discordUsername = ?", newAccount.discordUsername).Scan(&username) == nil || discordUsernameExistsInMem(newAccount.discordId) + registerstruct.AlreadyEsitsInDatabase.DiscordUsername = db.QueryRow("select username from account where discordUserId = ?", newAccount.discordId).Scan(&username) == nil || discordUsernameExistsInMem(newAccount.discordId) } registerstruct.Success = !registerstruct.WrongAccount.User && !registerstruct.WrongAccount.Pass && !registerstruct.WrongAccount.Email && !registerstruct.WrongAccount.DiscordUser && !registerstruct.AlreadyEsitsInDatabase.DiscordUsername && !registerstruct.AlreadyEsitsInDatabase.Username if !registerstruct.Success { @@ -130,6 +140,7 @@ func main() { } token, err := GenerateRandomStringURLSafe(64) log(err) + var dmChannel *discordgo.Channel dmChannel, err = discord.UserChannelCreate(newRbuMember.User.ID) log(err) discord.ChannelMessageSend(dmChannel.ID, "Bitte klicke auf den Link, um die Erstellung des Accounts abzuschließen.\nhttp://localhost:8080/submit?token=" + token) @@ -154,25 +165,27 @@ func main() { log(err) hash := argon2.IDKey([]byte(account.password), salt, 1, 64*1024, 4, 32) // add user to the database - query := "INSERT INTO account(username, email, hash, salt, discordUsername) VALUES (?, ?, ?, ?, ?)" + query := "INSERT INTO account(username, email, hash, salt, discordUserId) VALUES (?, ?, ?, ?, ?)" ctx, cancelfunc := context.WithTimeout(context.Background(), 5*time.Second) defer cancelfunc() stmt, err := db.PrepareContext(ctx, query) log(err) defer stmt.Close() - _, err = stmt.ExecContext(ctx, account.username, account.email, hash, salt, account.discordUsername) + _, err = stmt.ExecContext(ctx, account.username, account.email, hash, salt, account.discordId) log(err) //_, err = moodle.AddUser(account.username + "wg", account.username, account.email, account.username, account.password) log(err) - opt := gitea.CreateUserOption{ - Email: account.email, - Username: account.username, - SourceID: 0, - Password: account.password, - SendNotify: false, + if config.CreateGiteaAccount { + opt := gitea.CreateUserOption{ + Email: account.email, + Username: account.username, + SourceID: 0, + Password: account.password, + SendNotify: false, + } + _, _, err = giteaClient.AdminCreateUser(opt) + log(err) } - _, _, err = giteaClient.AdminCreateUser(opt) - log(err) } submitReturn: err = submitTmpl.Execute(w, submitStruct)