Compare commits
2 Commits
a3939cf2ea
...
5db5b0aeba
| Author | SHA1 | Date | |
|---|---|---|---|
| 5db5b0aeba | |||
| 40dbf1123a |
4
config.json
Normal file
4
config.json
Normal file
@ -0,0 +1,4 @@
|
||||
{
|
||||
"createGiteaAccount": false,
|
||||
"port": 8080
|
||||
}
|
||||
2
go.mod
2
go.mod
@ -3,12 +3,14 @@ module git.redstoneunion.de/MrGeorgen/RBU_account
|
||||
go 1.14
|
||||
|
||||
require (
|
||||
code.gitea.io/sdk/gitea v0.13.1
|
||||
github.com/bwmarrin/discordgo v0.22.0
|
||||
github.com/cornelk/hashmap v1.0.1
|
||||
github.com/dlclark/regexp2 v1.4.0
|
||||
github.com/go-sql-driver/mysql v1.5.0
|
||||
github.com/golang/protobuf v1.4.3 // indirect
|
||||
github.com/gorilla/websocket v1.4.2 // indirect
|
||||
github.com/hashicorp/go-version v1.2.1 // indirect
|
||||
github.com/tidwall/rhh v1.1.1 // indirect
|
||||
github.com/tidwall/shardmap v0.0.0-20190927132224-c190691bd211
|
||||
github.com/zaddok/moodle v0.6.6
|
||||
|
||||
13
go.sum
13
go.sum
@ -1,4 +1,7 @@
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
code.gitea.io/sdk v0.11.0 h1:R3VdjBCxObyLKnv4Svd/TM6oGsXzN8JORbzgkEFb83w=
|
||||
code.gitea.io/sdk/gitea v0.13.1 h1:Y7bpH2iO6Q0KhhMJfjP/LZ0AmiYITeRQlCD8b0oYqhk=
|
||||
code.gitea.io/sdk/gitea v0.13.1/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
||||
github.com/bwmarrin/discordgo v0.20.3 h1:AxjcHGbyBFSC0a3Zx5nDQwbOjU7xai5dXjRnZ0YB7nU=
|
||||
@ -11,6 +14,7 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cornelk/hashmap v1.0.1 h1:RXGcy29hEdLLV8T6aK4s+BAd4tq4+3Hq50N2GoG0uIg=
|
||||
github.com/cornelk/hashmap v1.0.1/go.mod h1:8wbysTUDnwJGrPZ1Iwsou3m+An6sldFrJItjRhfegCw=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dchest/siphash v1.1.0 h1:1Rs9eTUlZLPBEvV+2sTaM8O0NWn0ppbgqS7p11aWawI=
|
||||
github.com/dchest/siphash v1.1.0/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4=
|
||||
github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
|
||||
@ -44,8 +48,15 @@ github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH
|
||||
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
|
||||
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
|
||||
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
|
||||
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI=
|
||||
github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/tidwall/lotsa v1.0.1/go.mod h1:X6NiU+4yHA3fE3Puvpnn1XMDrFZrE9JO2/w+UMuqgR8=
|
||||
github.com/tidwall/rhh v1.1.1 h1:8zDpMKcK1pA1zU+Jyuo1UdzTFvME8pH3Sx/MdYgM5sE=
|
||||
github.com/tidwall/rhh v1.1.1/go.mod h1:DmqiIRtSnlVEi5CSKqNaX6m3YTa3YNSYrGB4FlfdLUU=
|
||||
@ -123,5 +134,7 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
|
||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
|
||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
|
||||
145
src/main.go
145
src/main.go
@ -1,7 +1,6 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"github.com/bwmarrin/discordgo"
|
||||
@ -13,12 +12,10 @@ import (
|
||||
"net/http"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
"golang.org/x/crypto/argon2"
|
||||
"context"
|
||||
"time"
|
||||
"github.com/cornelk/hashmap"
|
||||
"code.gitea.io/sdk/gitea"
|
||||
"fmt"
|
||||
"golang.org/x/crypto/argon2"
|
||||
)
|
||||
var discord *discordgo.Session
|
||||
var secret secrets_json
|
||||
@ -26,6 +23,8 @@ var config config_json
|
||||
var cacheAccounts hashmap.HashMap
|
||||
var db *sql.DB
|
||||
var giteaClient *gitea.Client
|
||||
var registerTmpl *template.Template
|
||||
var submitTmpl *template.Template
|
||||
type account struct {
|
||||
email string
|
||||
username string
|
||||
@ -60,6 +59,7 @@ type secrets_json struct {
|
||||
}
|
||||
type config_json struct {
|
||||
CreateGiteaAccount bool `json:"createGiteaAccount"`
|
||||
Port uint16 `json:"port"`
|
||||
}
|
||||
|
||||
func main() {
|
||||
@ -98,111 +98,14 @@ func main() {
|
||||
log(err)
|
||||
moodle := moodle.NewMoodleApi("https://exam.redstoneunion.de/", secret.MoodleToken)
|
||||
_ = moodle
|
||||
tmpl := template.Must(template.ParseFiles("tmpl/register.html"))
|
||||
submitTmpl := template.Must(template.ParseFiles("tmpl/submit.html"))
|
||||
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("/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.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)
|
||||
registerstruct.WrongAccount.Pass, _ = rpassword.MatchString(newAccount.password)
|
||||
registerstruct.WrongAccount.Pass = !registerstruct.WrongAccount.Pass
|
||||
newRbuMember, registerstruct.WrongAccount.DiscordUser = getRbuMember(newAccount.discordUsername, newAccount.discordTag)
|
||||
registerstruct.WrongAccount.DiscordUser = !registerstruct.WrongAccount.DiscordUser
|
||||
if registerstruct.WrongAccount.DiscordUser {
|
||||
goto registerReturn
|
||||
}
|
||||
newAccount.discordId = newRbuMember.User.ID
|
||||
{
|
||||
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 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 {
|
||||
goto registerReturn
|
||||
}
|
||||
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)
|
||||
cacheAccounts.Set(token, newAccount)
|
||||
}
|
||||
registerReturn: err = tmpl.Execute(w, registerstruct)
|
||||
log(err)
|
||||
})
|
||||
http.HandleFunc("/submit", func(w http.ResponseWriter, r *http.Request) {
|
||||
var submitStruct SubmitStruct
|
||||
token := r.FormValue("token")
|
||||
var accInter interface{}
|
||||
accInter, submitStruct.Success = cacheAccounts.GetStringKey(token)
|
||||
if !submitStruct.Success {
|
||||
goto submitReturn
|
||||
}
|
||||
{
|
||||
var account account = accInter.(account)
|
||||
cacheAccounts.Del(token)
|
||||
salt := make([]byte, 32)
|
||||
_, err := rand.Read(salt)
|
||||
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, 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.discordId)
|
||||
log(err)
|
||||
//_, err = moodle.AddUser(account.username + "wg", account.username, account.email, account.username, account.password)
|
||||
log(err)
|
||||
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)
|
||||
}
|
||||
}
|
||||
registerTmpl = template.Must(template.ParseFiles("tmpl/register.html"))
|
||||
submitTmpl = template.Must(template.ParseFiles("tmpl/submit.html"))
|
||||
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("/register", register)
|
||||
|
||||
submitReturn: err = submitTmpl.Execute(w, submitStruct)
|
||||
log(err)
|
||||
})
|
||||
|
||||
http.ListenAndServe(":8080", nil)
|
||||
}
|
||||
func getRbuMember(user string, tag string) (*discordgo.Member, bool) {
|
||||
allUsers, err := discord.GuildMembers(secret.DiscordServerID, "0", 1000)
|
||||
log(err)
|
||||
for _, element := range allUsers {
|
||||
if element.User.Username == user && element.User.Discriminator == tag{
|
||||
return element, true
|
||||
}
|
||||
}
|
||||
return nil, false
|
||||
http.ListenAndServe(":" + fmt.Sprint(config.Port), nil)
|
||||
}
|
||||
func log(err error) {
|
||||
if err!=nil {
|
||||
@ -210,26 +113,6 @@ func log(err error) {
|
||||
}
|
||||
}
|
||||
|
||||
func UsernameExistsInMem(username string) bool {
|
||||
for key := range cacheAccounts.Iter() {
|
||||
var accInter interface{}
|
||||
accInter, _ = cacheAccounts.Get(key)
|
||||
var account account = accInter.(account)
|
||||
if account.username == username {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func discordUsernameExistsInMem(id string) bool {
|
||||
for key := range cacheAccounts.Iter() {
|
||||
var accInter interface{}
|
||||
accInter, _ = cacheAccounts.Get(key)
|
||||
var account account = accInter.(account)
|
||||
if account.discordId == id {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
func hash(password []byte, salt []byte) []byte {
|
||||
return argon2.IDKey(password, salt, 1, 64*1024, 4, 32)
|
||||
}
|
||||
|
||||
139
src/register.go
Normal file
139
src/register.go
Normal file
@ -0,0 +1,139 @@
|
||||
package main
|
||||
import (
|
||||
"github.com/bwmarrin/discordgo"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"net/http"
|
||||
"strings"
|
||||
"regexp"
|
||||
"github.com/dlclark/regexp2"
|
||||
"context"
|
||||
"time"
|
||||
"code.gitea.io/sdk/gitea"
|
||||
"crypto/rand"
|
||||
)
|
||||
var rusername *regexp.Regexp
|
||||
var remail *regexp2.Regexp
|
||||
var rpassword *regexp2.Regexp
|
||||
func register(w http.ResponseWriter, r *http.Request) {
|
||||
var err error
|
||||
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.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)
|
||||
registerstruct.WrongAccount.Pass, _ = rpassword.MatchString(newAccount.password)
|
||||
registerstruct.WrongAccount.Pass = !registerstruct.WrongAccount.Pass
|
||||
newRbuMember, registerstruct.WrongAccount.DiscordUser = getRbuMember(newAccount.discordUsername, newAccount.discordTag)
|
||||
registerstruct.WrongAccount.DiscordUser = !registerstruct.WrongAccount.DiscordUser
|
||||
if registerstruct.WrongAccount.DiscordUser {
|
||||
goto registerReturn
|
||||
}
|
||||
newAccount.discordId = newRbuMember.User.ID
|
||||
{
|
||||
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 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 {
|
||||
goto registerReturn
|
||||
}
|
||||
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)
|
||||
cacheAccounts.Set(token, newAccount)
|
||||
}
|
||||
registerReturn: err = registerTmpl.Execute(w, registerstruct)
|
||||
log(err)
|
||||
}
|
||||
func submit(w http.ResponseWriter, r *http.Request) {
|
||||
var err error
|
||||
var submitStruct SubmitStruct
|
||||
token := r.FormValue("token")
|
||||
var accInter interface{}
|
||||
accInter, submitStruct.Success = cacheAccounts.GetStringKey(token)
|
||||
if !submitStruct.Success {
|
||||
goto submitReturn
|
||||
}
|
||||
{
|
||||
var account account = accInter.(account)
|
||||
cacheAccounts.Del(token)
|
||||
salt := make([]byte, 32)
|
||||
_, err := rand.Read(salt)
|
||||
log(err)
|
||||
hash := hash([]byte(account.password), salt)
|
||||
// add user to the database
|
||||
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.discordId)
|
||||
log(err)
|
||||
//_, err = moodle.AddUser(account.username + "wg", account.username, account.email, account.username, account.password)
|
||||
log(err)
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
submitReturn: err = submitTmpl.Execute(w, submitStruct)
|
||||
log(err)
|
||||
}
|
||||
func getRbuMember(user string, tag string) (*discordgo.Member, bool) {
|
||||
allUsers, err := discord.GuildMembers(secret.DiscordServerID, "0", 1000)
|
||||
log(err)
|
||||
for _, element := range allUsers {
|
||||
if element.User.Username == user && element.User.Discriminator == tag{
|
||||
return element, true
|
||||
}
|
||||
}
|
||||
return nil, false
|
||||
}
|
||||
func UsernameExistsInMem(username string) bool {
|
||||
for key := range cacheAccounts.Iter() {
|
||||
var accInter interface{}
|
||||
accInter, _ = cacheAccounts.Get(key)
|
||||
var account account = accInter.(account)
|
||||
if account.username == username {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func discordUsernameExistsInMem(id string) bool {
|
||||
for key := range cacheAccounts.Iter() {
|
||||
var accInter interface{}
|
||||
accInter, _ = cacheAccounts.Get(key)
|
||||
var account account = accInter.(account)
|
||||
if account.discordId == id {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
@ -1,34 +1,105 @@
|
||||
{{if .Success}}
|
||||
<p>Bitte klicke in discord auf den Bestätigungslink.</p>
|
||||
{{else}}
|
||||
<h1>Erstelle ein RBU Account</h1>
|
||||
<form method="POST">
|
||||
<label>Benutzername:</label><br/>
|
||||
<input type="text" name="username"><br/>
|
||||
<label>E-Mail:</label><br/>
|
||||
<input type="text" name="email"><br/>
|
||||
<label>Discordbenutzername (ohne ####):</label><br/>
|
||||
<input type="text" name="discordUser"><br/>
|
||||
<label>Passwort:</label><br/>
|
||||
<input name="password"><br/>
|
||||
<input type="submit" name="createAccount" value="Account erstellen">
|
||||
</form>
|
||||
{{end}}
|
||||
{{if .WrongAccount.User}}
|
||||
<p>Ungültiger Benutzername. Benutzer müssen klein geschrieben werden, dürfen höchstens aus 40 Zeichen bestehen. Alle Zeichen müssen zudem alphanumerisch sein. "-", "_" und "." sind auch erlaubt.</p>
|
||||
{{end}}
|
||||
{{if .WrongAccount.Email}}
|
||||
<p>Ungültige E-Mail-Adresse.</p>
|
||||
{{end}}
|
||||
{{if .WrongAccount.Pass}}
|
||||
<p>Ungültiges Passwort. Passwörter müssen 8 bis 255 Zeichen lang sein. Außerdem muss ein Groß- und Kleichbuchstabe, eine Ziffer und ein Sonderzeichen enthalten sein</p>
|
||||
{{end}}
|
||||
{{if .WrongAccount.DiscordUser}}
|
||||
<p>Discordbenutzer ist nicht auf den RBU server. Beachte den tag wegzulassen.</p>
|
||||
{{end}}
|
||||
{{if .AlreadyEsitsInDatabase.Username}}
|
||||
<p>Diesen Benutzername ist leider schon vergeben.</p>
|
||||
{{end}}
|
||||
{{if .AlreadyEsitsInDatabase.DiscordUsername}}
|
||||
<p>Dieses RBU Mitglied hat bereits einen Account.</p>
|
||||
{{end}}
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>RBU - Register</title>
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
|
||||
<link rel="stylesheet" type="text/css" href="https://redstoneunion.de/assets/css/bs/styles.css">
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
|
||||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
|
||||
<script src="Subject-Dateien/js"></script>
|
||||
<script>
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
|
||||
function gtag() {
|
||||
dataLayer.push(arguments);
|
||||
}
|
||||
gtag('js', new Date());
|
||||
</script>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="icon" type="image/x-icon" href="https://redstoneunion.de/assets/img/mds_vers2.png">
|
||||
<link href="https://redstoneunion.de/assets/css/css.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://redstoneunion.de/assets/css/styles.css">
|
||||
<link rel="stylesheet" type="text/css" href="https://redstoneunion.de/assets/css/font1.css">
|
||||
<link rel="stylesheet" type="text" href="https://redstoneunion.de/assets/css/font2.css">
|
||||
<link rel="stylesheet" type="text" href="https://redstoneunion.de/assets/css/font3.css">
|
||||
<link rel="stylesheet" type="text" href="https://redstoneunion.de/assets/css/font4.css">
|
||||
<link rel="stylesheet" type="text" href="https://redstoneunion.de/assets/css/font5.css">
|
||||
<link rel="stylesheet" type="text" href="https://redstoneunion.de/assets/css/font5.css">
|
||||
<link rel="stylesheet" type="text" href="https://redstoneunion.de/assets/css/layout1.css">
|
||||
<link rel="stylesheet" type="text" href="https://redstoneunion.de/assets/css/calendar1.css.css">
|
||||
<link rel="stylesheet" href="https://redstoneunion.de/assets/animate.css">
|
||||
<link rel="stylesheet" href="https://redstoneunion.de/assets/local.css">
|
||||
</head>
|
||||
<body>
|
||||
<ul>
|
||||
<li>
|
||||
<div class="mdslogo"><img src="https://redstoneunion.de/assets/img/rbu_logo_modern_wasser.png" class="logoimg"></div>
|
||||
</li>
|
||||
<li><a href="https://redstoneunion.de/index.html">Home</a></li>
|
||||
<li><a href="https://redstoneunion.de/project/index.html">Projekte</a></li>
|
||||
<li><a href="https://redstoneunion.de/mds/home.html">MDS</a></li>
|
||||
<li><a href="https://redstoneunion.de/downloads/index.html">Downloads</a></li>
|
||||
<li><a href="https://redstoneunion.de/imc/index.html">IMC</a>
|
||||
<li><a href="https://redstoneunion.de/applications/index.html">Karriere</a></li>
|
||||
</ul>
|
||||
<div class="row">
|
||||
<center>
|
||||
<div class="Banner responsive">
|
||||
<div class="abs">
|
||||
<img src="https://redstoneunion.de/assets/img/2019-12-22_00.04.35.png" class="responsive">
|
||||
</div>
|
||||
<div class="regcard">
|
||||
<img src="https://redstoneunion.de/assets/img/rbu_logo_normal_modern_db.png"class="responsive"><br>
|
||||
{{if .Success}}
|
||||
<p>Bitte klicke in discord auf den Bestätigungslink.</p>
|
||||
{{else}}
|
||||
<h1>Erstelle ein RBU Account</h1>
|
||||
<form method="POST"class="responsive">
|
||||
<label class="responsive">Benutzername:</label><br/>
|
||||
<input class="responsive" type="text" name="username"><br/>
|
||||
<label class="responsive">E-Mail:</label><br/>
|
||||
<input class="responsive" type="text" name="email"><br/>
|
||||
<label class="responsive">Discordbenutzername (mit ####):</label><br/>
|
||||
<input class="responsive" type="text" name="discordUser"><br/>
|
||||
<label class="responsive">Passwort:</label><br/>
|
||||
<input class="responsive" type="password" name="password"><br/>
|
||||
<input type="submit" name="createAccount" value="Account erstellen"class="btn active responsive">
|
||||
</form>
|
||||
{{end}}
|
||||
{{if .WrongAccount.User}}
|
||||
<p>Ungültiger Benutzername. Benutzer müssen klein geschrieben werden, dürfen höchstens aus 40 Zeichen bestehen. Alle Zeichen müssen zudem alphanumerisch sein. "-", "_" und "." sind auch erlaubt.</p>
|
||||
{{end}}
|
||||
{{if .WrongAccount.Email}}
|
||||
<p>Ungültige E-Mail-Adresse.</p>
|
||||
{{end}}
|
||||
{{if .WrongAccount.Pass}}
|
||||
<p>Ungültiges Passwort. Passwörter müssen 8 bis 255 Zeichen lang sein. Außerdem muss ein Groß- und Kleichbuchstabe, eine Ziffer und ein Sonderzeichen enthalten sein</p>
|
||||
{{end}}
|
||||
{{if .WrongAccount.DiscordUser}}
|
||||
<p>Discordbenutzer ist nicht auf den RBU server. Beachte den tag anzugeben.</p>
|
||||
{{end}}
|
||||
{{if .AlreadyEsitsInDatabase.Username}}
|
||||
<p>Diesen Benutzername ist leider schon vergeben.</p>
|
||||
{{end}}
|
||||
{{if .AlreadyEsitsInDatabase.DiscordUsername}}
|
||||
<p>Dieses RBU Mitglied hat bereits einen Account.</p>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
</center>
|
||||
</div>
|
||||
<footer _ngcontent-c1="" class="footer" style="background-color: #031D41;">
|
||||
<div _ngcontent-c1="" class="container">
|
||||
<img _ngcontent-c1="" alt="RBU logo" class="logo" src="https://redstoneunion.de/assets/img/rbu_logo_modern_wasser.png">
|
||||
<div _ngcontent-c1="" class="copyright">
|
||||
<p _ngcontent-c1="">
|
||||
Copyright © 2020 RBU All rights reserved <a href="https://redstoneunion.de/rechtliches/impressum.html" class="negtext">Impressum & Datenschutzverordung</a>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div _ngcontent-c1="" class="top" style="background-color: rgb(177, 51, 41);">
|
||||
</div>
|
||||
</footer>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user