Compare commits
2 Commits
b62bd426cf
...
9785be44c4
| Author | SHA1 | Date | |
|---|---|---|---|
| 9785be44c4 | |||
| bab69c6441 |
12
go.mod
Normal file
12
go.mod
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
module git.redstoneunion.de/MrGeorgen/RBU_account
|
||||||
|
|
||||||
|
go 1.14
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/bwmarrin/discordgo v0.20.3
|
||||||
|
github.com/dlclark/regexp2 v1.2.0
|
||||||
|
github.com/go-sql-driver/mysql v1.5.0
|
||||||
|
github.com/gorilla/websocket v1.4.2 // indirect
|
||||||
|
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 // indirect
|
||||||
|
golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
|
||||||
|
)
|
||||||
22
go.sum
Normal file
22
go.sum
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
github.com/bwmarrin/discordgo v0.20.3 h1:AxjcHGbyBFSC0a3Zx5nDQwbOjU7xai5dXjRnZ0YB7nU=
|
||||||
|
github.com/bwmarrin/discordgo v0.20.3/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
|
||||||
|
github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk=
|
||||||
|
github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
|
||||||
|
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
|
||||||
|
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||||
|
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
|
||||||
|
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=
|
||||||
|
golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 h1:y6ce7gCWtnH+m3dCjzQ1PCuwl28DDIc3VNnvY29DlIA=
|
||||||
|
golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||||
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM=
|
||||||
|
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
|
||||||
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200610111108-226ff32320da h1:bGb80FudwxpeucJUjPYJXuJ8Hk91vNtfvrymzwiei38=
|
||||||
|
golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
36
src/main.go
36
src/main.go
@ -12,9 +12,11 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
var discord *discordgo.Session
|
var discord *discordgo.Session
|
||||||
var secret secrets_json
|
var secret secrets_json
|
||||||
|
var cacheAccounts []account
|
||||||
type account struct {
|
type account struct {
|
||||||
email string
|
email string
|
||||||
username string
|
username string
|
||||||
@ -31,6 +33,10 @@ type WrongAccount struct {
|
|||||||
type registertmpl struct {
|
type registertmpl struct {
|
||||||
Success bool
|
Success bool
|
||||||
WrongAccount WrongAccount
|
WrongAccount WrongAccount
|
||||||
|
AlreadyEsitsInDatabase struct{
|
||||||
|
Username bool
|
||||||
|
DiscordUsername bool
|
||||||
|
}
|
||||||
}
|
}
|
||||||
type SubmitStruct struct {
|
type SubmitStruct struct {
|
||||||
Success bool
|
Success bool
|
||||||
@ -42,7 +48,7 @@ type secrets_json struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
cacheAccounts := make([]account, 1)
|
cacheAccounts = make([]account, 1)
|
||||||
var newRbuMember *discordgo.Member
|
var newRbuMember *discordgo.Member
|
||||||
var dmChannel *discordgo.Channel
|
var dmChannel *discordgo.Channel
|
||||||
var err error
|
var err error
|
||||||
@ -86,13 +92,18 @@ func main() {
|
|||||||
}
|
}
|
||||||
registerstruct.WrongAccount.Email, _ = remail.MatchString(newAccount.email)
|
registerstruct.WrongAccount.Email, _ = remail.MatchString(newAccount.email)
|
||||||
registerstruct.WrongAccount.Email = !registerstruct.WrongAccount.Email
|
registerstruct.WrongAccount.Email = !registerstruct.WrongAccount.Email
|
||||||
registerstruct.WrongAccount.User = !rusername.MatchString(newAccount.username)
|
registerstruct.WrongAccount.User = !rusername.MatchString(newAccount.username) || strings.Contains(newAccount.username, "\"")
|
||||||
registerstruct.WrongAccount.Pass, _ = rpassword.MatchString(newAccount.password)
|
registerstruct.WrongAccount.Pass, _ = rpassword.MatchString(newAccount.password)
|
||||||
registerstruct.WrongAccount.Pass = !registerstruct.WrongAccount.Pass
|
registerstruct.WrongAccount.Pass = !registerstruct.WrongAccount.Pass
|
||||||
newRbuMember, registerstruct.WrongAccount.DiscordUser = getRbuMember(newAccount.discordUsername)
|
newRbuMember, registerstruct.WrongAccount.DiscordUser = getRbuMember(newAccount.discordUsername)
|
||||||
registerstruct.WrongAccount.DiscordUser = !registerstruct.WrongAccount.DiscordUser
|
registerstruct.WrongAccount.DiscordUser = !registerstruct.WrongAccount.DiscordUser
|
||||||
if !registerstruct.WrongAccount.User && !registerstruct.WrongAccount.Pass && !registerstruct.WrongAccount.Email && !registerstruct.WrongAccount.DiscordUser {
|
{
|
||||||
registerstruct.Success = true
|
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.discordUsername)
|
||||||
|
}
|
||||||
|
registerstruct.Success = !registerstruct.WrongAccount.User && !registerstruct.WrongAccount.Pass && !registerstruct.WrongAccount.Email && !registerstruct.WrongAccount.DiscordUser && !registerstruct.AlreadyEsitsInDatabase.DiscordUsername && !registerstruct.AlreadyEsitsInDatabase.Username
|
||||||
|
if registerstruct.Success {
|
||||||
newAccount.token, err = GenerateRandomStringURLSafe(64)
|
newAccount.token, err = GenerateRandomStringURLSafe(64)
|
||||||
log(err)
|
log(err)
|
||||||
dmChannel, err = discord.UserChannelCreate(newRbuMember.User.ID)
|
dmChannel, err = discord.UserChannelCreate(newRbuMember.User.ID)
|
||||||
@ -139,3 +150,20 @@ func log(err error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func UsernameExistsInMem(username string) bool {
|
||||||
|
for _, element := range cacheAccounts {
|
||||||
|
if element.username == username {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func discordUsernameExistsInMem(discordUsername string) bool {
|
||||||
|
for _, element := range cacheAccounts {
|
||||||
|
if element.discordUsername == discordUsername {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@ -25,4 +25,10 @@
|
|||||||
{{end}}
|
{{end}}
|
||||||
{{if .WrongAccount.DiscordUser}}
|
{{if .WrongAccount.DiscordUser}}
|
||||||
<p>Discordbenutzer ist nicht auf den RBU server. Beachte den tag wegzulassen.</p>
|
<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}}
|
{{end}}
|
||||||
Reference in New Issue
Block a user