AP stuff almost works

storage-new/self.go

@@ -1,8 +1,9 @@
 package storage
 
 import (
-	"crypto/ed25519"
 	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
 	"database/sql"
 
 	"git.mstar.dev/mstar/goutils/other"
@@ -102,7 +103,16 @@ func insertUser(server *models.RemoteServer) (*models.User, error) {
 	if err != gorm.ErrRecordNotFound {
 		return nil, err
 	}
-	publicKey, privateKey, err := ed25519.GenerateKey(nil)
+	// publicKey, privateKey, err := ed25519.GenerateKey(nil)
+	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		return nil, err
+	}
+	if err = privateKey.Validate(); err != nil {
+		return nil, err
+	}
+	privateKeyBytes := x509.MarshalPKCS1PrivateKey(privateKey)
+	publicKeyBytes := x509.MarshalPKCS1PublicKey(&privateKey.PublicKey)
 	pkeyId := make([]byte, 64)
 	_, err = rand.Read(pkeyId)
 	if err != nil {
@@ -126,8 +136,8 @@ func insertUser(server *models.RemoteServer) (*models.User, error) {
 		Banner:               nil,
 		BannerId:             sql.NullString{Valid: false},
 		Indexable:            false,
-		PublicKey:            publicKey,
-		PrivateKey:           privateKey,
+		PublicKey:            publicKeyBytes,
+		PrivateKey:           privateKeyBytes,
 		Verified:             true,
 		FinishedRegistration: true,
 		PasskeyId:            pkeyId,
@@ -155,11 +165,21 @@ func insertUserPronoun(user *models.User) error {
 }
 
 func attachUserToRole(user *models.User) error {
-	u2r := models.UserToRole{
-		User:   *user,
-		UserId: user.ID,
-		Role:   models.FullAdminRole,
-		RoleId: models.FullAdminRole.ID,
+	_, err := dbgen.UserToRole.Where(dbgen.UserToRole.UserId.Eq(user.ID)).
+		Where(dbgen.UserToRole.RoleId.Eq(models.FullAdminRole.ID)).
+		First()
+	switch err {
+	case nil:
+		return nil
+	case gorm.ErrRecordNotFound:
+		u2r := models.UserToRole{
+			User:   *user,
+			UserId: user.ID,
+			Role:   models.FullAdminRole,
+			RoleId: models.FullAdminRole.ID,
+		}
+		return dbgen.UserToRole.Save(&u2r)
+	default:
+		return err
 	}
-	return dbgen.UserToRole.Save(&u2r)
 }