Skip to content
Snippets Groups Projects
Commit 682916dc authored by Josh Brooks's avatar Josh Brooks
Browse files

Fix tests, clean up code

parent 5b1545a9
No related branches found
No related tags found
4 merge requests!50Revert "update deps",!48Release,!42Add username field to users table for raw username,!41Xx 3692/banned users
...@@ -41,22 +41,22 @@ func registerUser(msg *pb.UDBUserRegistration, permPublicKey *rsa.PublicKey, ...@@ -41,22 +41,22 @@ func registerUser(msg *pb.UDBUserRegistration, permPublicKey *rsa.PublicKey,
"Please try again") "Please try again")
} }
flattened := canonicalize(username) canonicalUsername := canonicalize(username)
// Check if username is valid // Check if username is valid
if err := isValidUsername(flattened); err != nil { if err := isValidUsername(canonicalUsername); err != nil {
return nil, errors.Errorf("Username %q is invalid: %v", username, err) return nil, errors.Errorf("Username %q is invalid: %v", username, err)
} }
// Check if the username is banned // Check if the username is banned
if bannedManager.IsBanned(flattened) { if bannedManager.IsBanned(canonicalUsername) {
// Return same error message as if the user was already taken // Return same error message as if the user was already taken
return &messages.Ack{}, errors.Errorf("Username %s is already taken. "+ return &messages.Ack{}, errors.Errorf("Username %s is already taken. "+
"Please try again", username) "Please try again", username)
} }
// Check if username is taken // Check if username is taken
err = store.CheckUser(flattened, uid) err = store.CheckUser(canonicalUsername, uid)
if err != nil { if err != nil {
return &messages.Ack{}, errors.Errorf("Username %q is already taken. "+ return &messages.Ack{}, errors.Errorf("Username %q is already taken. "+
"Please try again", username) "Please try again", username)
...@@ -88,9 +88,9 @@ func registerUser(msg *pb.UDBUserRegistration, permPublicKey *rsa.PublicKey, ...@@ -88,9 +88,9 @@ func registerUser(msg *pb.UDBUserRegistration, permPublicKey *rsa.PublicKey,
return &messages.Ack{}, errors.New("Could not verify fact signature") return &messages.Ack{}, errors.New("Could not verify fact signature")
} }
flattendFact, err := fact.NewFact(fact.FactType(msg.Frs.Fact.FactType), flattened) canonicalFact, err := fact.NewFact(fact.FactType(msg.Frs.Fact.FactType), canonicalUsername)
if err != nil { if err != nil {
return &messages.Ack{}, errors.WithMessage(err, "Failed to hash flattened fact") return &messages.Ack{}, errors.WithMessage(err, "Failed to hash canonicalUsername fact")
} }
// Verify the signed identity data // Verify the signed identity data
...@@ -102,9 +102,9 @@ func registerUser(msg *pb.UDBUserRegistration, permPublicKey *rsa.PublicKey, ...@@ -102,9 +102,9 @@ func registerUser(msg *pb.UDBUserRegistration, permPublicKey *rsa.PublicKey,
// Create fact off of username // Create fact off of username
f := storage.Fact{ f := storage.Fact{
Hash: factID.Fingerprint(flattendFact), Hash: factID.Fingerprint(canonicalFact),
UserId: msg.UID, UserId: msg.UID,
Fact: flattened, Fact: canonicalUsername,
Type: uint8(msg.Frs.Fact.FactType), Type: uint8(msg.Frs.Fact.FactType),
Signature: msg.Frs.FactSig, Signature: msg.Frs.FactSig,
Verified: true, Verified: true,
......
...@@ -192,7 +192,7 @@ func TestRegisterUser_Banned(t *testing.T) { ...@@ -192,7 +192,7 @@ func TestRegisterUser_Banned(t *testing.T) {
t.FailNow() t.FailNow()
} }
bannedManager, err := banned.NewManager(registerMsg.IdentityRegistration.Username, "") bannedManager, err := banned.NewManager(canonicalize(registerMsg.IdentityRegistration.Username), "")
if err != nil { if err != nil {
t.Fatalf("Failed to construct ban manager: %v", err) t.Fatalf("Failed to construct ban manager: %v", err)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment