mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-18 12:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix instance account not being created (#310)

Browse source 
* Rework 'CreateInstanceAccount' with better checking logic

* add test for create instance account
This commit is contained in:
tobi 2021-11-17 13:40:09 +01:00 • committed by GitHub
commit ff7c96caa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/db/bundb/admin.go
View file

@ -178,18 +178,19 @@ func (a *adminDB) NewSignup(ctx context.Context, username string, reason string,
func (a *adminDB) CreateInstanceAccount(ctx context.Context) db.Error {
username := a.config.Host
// check if instance account already exists
existsQ := a.conn.
q := a.conn.
NewSelect().
Model(&gtsmodel.Account{}).
Where("username = ?", username).
WhereGroup(" AND ", whereEmptyOrNull("domain"))
count, err := existsQ.Count(ctx)
if err != nil && count == 1 {
exists, err := a.conn.Exists(ctx, q)
if err != nil {
return err
}
if exists {
logrus.Infof("instance account %s already exists", username)
return nil
} else if err != sql.ErrNoRows {
return a.conn.ProcessError(err)
}
key, err := rsa.GenerateKey(rand.Reader, 2048)