devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

feat:

Browse Source 
* encrypted userid
* added totp_verified column in user table
* started test for totp
This commit is contained in:
lemonScaletech 2023-09-06 18:49:54 +05:30
parent bbb1cf6301
commit a3fa0eb6cd
13 changed files with 157 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/crypto/rsa.go
View File

@ -8,7 +8,6 @@ import (
"encoding/base64" "encoding/base64"
"encoding/pem" "encoding/pem"
"errors" "errors"
"fmt"
) )
// NewRSAKey to generate new RSA Key if env is not set // NewRSAKey to generate new RSA Key if env is not set
@ -138,28 +137,5 @@ func DecryptRSA(cipherText string, privateKey rsa.PrivateKey) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
fmt.Println("Plaintext:", string(plaintext))
return string(plaintext), nil return string(plaintext), nil
} }
func ParseRSAPublicKey(key string) (*rsa.PublicKey, error) {
// Decode the PEM-encoded public key data.
block, _ := pem.Decode([]byte(key))
if block == nil {
return nil, fmt.Errorf("failed to parse PEM block containing public key")
}
// Parse the DER-encoded public key data.
pubKey, err := x509.ParsePKIXPublicKey(block.Bytes)
if err != nil {
return nil, err
}
// Type-assert the parsed public key to an rsa.PublicKey.
rsaPublicKey, ok := pubKey.(*rsa.PublicKey)
if !ok {
return nil, fmt.Errorf("parsed public key is not an RSA public key")
}
return rsaPublicKey, nil
}

1
server/db/models/user.go
View File

@ -35,6 +35,7 @@ type User struct {
CreatedAt int64 `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"` CreatedAt int64 `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
AppData *string `json:"app_data" bson:"app_data" cql:"app_data" dynamo:"app_data"` AppData *string `json:"app_data" bson:"app_data" cql:"app_data" dynamo:"app_data"`
TotpSecret *string `json:"totp_secret" bson:"totp_secret" cql:"totp_secret" dynamo:"totp_secret"` TotpSecret *string `json:"totp_secret" bson:"totp_secret" cql:"totp_secret" dynamo:"totp_secret"`
TotpVerified bool `json:"totp_verified" bson:"totp_verified" cql:"totp_verified" dynamo:"totp_verified"`
} }
func (user *User) AsAPIUser() *model.User { func (user *User) AsAPIUser() *model.User {

47
server/db/providers/arangodb/totp.go
View File

@ -3,13 +3,8 @@ package arangodb
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"fmt" "fmt"
"image/png" "image/png"
"os"
"time" "time"
"github.com/pquerna/otp/totp" "github.com/pquerna/otp/totp"
@ -62,44 +57,14 @@ func (p *provider) ValidatePasscode(ctx context.Context, passcode string, id str
if err != nil { if err != nil {
return false, fmt.Errorf("error while getting user details") return false, fmt.Errorf("error while getting user details")
} }
status := totp.Validate(passcode, *user.TotpSecret)
// validate passcode inputted by user if !user.TotpVerified {
for {
status := totp.Validate(passcode, *user.TotpSecret)
if status { if status {
user.TotpVerified = true
p.UpdateUser(ctx, user)
return status, nil return status, nil
} }
return status, nil
} }
} return status, nil
func (p *provider) GenerateKeysTOTP() (*rsa.PublicKey, error) {
key := os.Getenv("TOTP_PRIVATE_KEY")
var privateKey *rsa.PrivateKey
if key == "" {
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
if err != nil {
return nil, err
}
privateKeyPEM := encodePrivateKeyToPEM(privateKey)
os.Setenv("TOTP_PRIVATE_KEY", string(privateKeyPEM))
}
publicKey := privateKey.PublicKey
return &publicKey, nil
}
func encodePrivateKeyToPEM(privateKey *rsa.PrivateKey) []byte {
// Marshal the private key to DER format.
privateKeyBytes := x509.MarshalPKCS1PrivateKey(privateKey)
// Create a PEM block for the private key.
privateKeyPEMBlock := &pem.Block{
Type: "RSA PRIVATE KEY",
Bytes: privateKeyBytes,
}
// Encode the PEM block to PEM format.
privateKeyPEM := pem.EncodeToMemory(privateKeyPEMBlock)
return privateKeyPEM
} }

47
server/db/providers/cassandradb/totp.go
View File

@ -3,13 +3,8 @@ package cassandradb
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"fmt" "fmt"
"image/png" "image/png"
"os"
"time" "time"
"github.com/pquerna/otp/totp" "github.com/pquerna/otp/totp"
@ -62,44 +57,14 @@ func (p *provider) ValidatePasscode(ctx context.Context, passcode string, id str
if err != nil { if err != nil {
return false, fmt.Errorf("error while getting user details") return false, fmt.Errorf("error while getting user details")
} }
status := totp.Validate(passcode, *user.TotpSecret)
// validate passcode inputted by user if !user.TotpVerified {
for {
status := totp.Validate(passcode, *user.TotpSecret)
if status { if status {
user.TotpVerified = true
p.UpdateUser(ctx, user)
return status, nil return status, nil
} }
return status, nil
} }
} return status, nil
func (p *provider) GenerateKeysTOTP() (*rsa.PublicKey, error) {
key := os.Getenv("TOTP_PRIVATE_KEY")
var privateKey *rsa.PrivateKey
if key == "" {
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
if err != nil {
return nil, err
}
privateKeyPEM := encodePrivateKeyToPEM(privateKey)
os.Setenv("TOTP_PRIVATE_KEY", string(privateKeyPEM))
}
publicKey := privateKey.PublicKey
return &publicKey, nil
}
func encodePrivateKeyToPEM(privateKey *rsa.PrivateKey) []byte {
// Marshal the private key to DER format.
privateKeyBytes := x509.MarshalPKCS1PrivateKey(privateKey)
// Create a PEM block for the private key.
privateKeyPEMBlock := &pem.Block{
Type: "RSA PRIVATE KEY",
Bytes: privateKeyBytes,
}
// Encode the PEM block to PEM format.
privateKeyPEM := pem.EncodeToMemory(privateKeyPEMBlock)
return privateKeyPEM
} }

47
server/db/providers/couchbase/totp.go
View File

@ -3,13 +3,8 @@ package couchbase
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"fmt" "fmt"
"image/png" "image/png"
"os"
"time" "time"
"github.com/pquerna/otp/totp" "github.com/pquerna/otp/totp"
@ -62,44 +57,14 @@ func (p *provider) ValidatePasscode(ctx context.Context, passcode string, id str
if err != nil { if err != nil {
return false, fmt.Errorf("error while getting user details") return false, fmt.Errorf("error while getting user details")
} }
status := totp.Validate(passcode, *user.TotpSecret)
// validate passcode inputted by user if !user.TotpVerified {
for {
status := totp.Validate(passcode, *user.TotpSecret)
if status { if status {
user.TotpVerified = true
p.UpdateUser(ctx, user)
return status, nil return status, nil
} }
return status, nil
} }
} return status, nil
func (p *provider) GenerateKeysTOTP() (*rsa.PublicKey, error) {
key := os.Getenv("TOTP_PRIVATE_KEY")
var privateKey *rsa.PrivateKey
if key == "" {
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
if err != nil {
return nil, err
}
privateKeyPEM := encodePrivateKeyToPEM(privateKey)
os.Setenv("TOTP_PRIVATE_KEY", string(privateKeyPEM))
}
publicKey := privateKey.PublicKey
return &publicKey, nil
}
func encodePrivateKeyToPEM(privateKey *rsa.PrivateKey) []byte {
// Marshal the private key to DER format.
privateKeyBytes := x509.MarshalPKCS1PrivateKey(privateKey)
// Create a PEM block for the private key.
privateKeyPEMBlock := &pem.Block{
Type: "RSA PRIVATE KEY",
Bytes: privateKeyBytes,
}
// Encode the PEM block to PEM format.
privateKeyPEM := pem.EncodeToMemory(privateKeyPEMBlock)
return privateKeyPEM
} }

47
server/db/providers/dynamodb/totp.go
View File

@ -3,13 +3,8 @@ package dynamodb
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"fmt" "fmt"
"image/png" "image/png"
"os"
"time" "time"
"github.com/pquerna/otp/totp" "github.com/pquerna/otp/totp"
@ -62,44 +57,14 @@ func (p *provider) ValidatePasscode(ctx context.Context, passcode string, id str
if err != nil { if err != nil {
return false, fmt.Errorf("error while getting user details") return false, fmt.Errorf("error while getting user details")
} }
status := totp.Validate(passcode, *user.TotpSecret)
// validate passcode inputted by user if !user.TotpVerified {
for {
status := totp.Validate(passcode, *user.TotpSecret)
if status { if status {
user.TotpVerified = true
p.UpdateUser(ctx, user)
return status, nil return status, nil
} }
return status, nil
} }
} return status, nil
func (p *provider) GenerateKeysTOTP() (*rsa.PublicKey, error) {
key := os.Getenv("TOTP_PRIVATE_KEY")
var privateKey *rsa.PrivateKey
if key == "" {
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
if err != nil {
return nil, err
}
privateKeyPEM := encodePrivateKeyToPEM(privateKey)
os.Setenv("TOTP_PRIVATE_KEY", string(privateKeyPEM))
}
publicKey := privateKey.PublicKey
return &publicKey, nil
}
func encodePrivateKeyToPEM(privateKey *rsa.PrivateKey) []byte {
// Marshal the private key to DER format.
privateKeyBytes := x509.MarshalPKCS1PrivateKey(privateKey)
// Create a PEM block for the private key.
privateKeyPEMBlock := &pem.Block{
Type: "RSA PRIVATE KEY",
Bytes: privateKeyBytes,
}
// Encode the PEM block to PEM format.
privateKeyPEM := pem.EncodeToMemory(privateKeyPEMBlock)
return privateKeyPEM
} }

47
server/db/providers/mongodb/totp.go
View File

@ -3,13 +3,8 @@ package mongodb
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"fmt" "fmt"
"image/png" "image/png"
"os"
"time" "time"
"github.com/pquerna/otp/totp" "github.com/pquerna/otp/totp"
@ -62,44 +57,14 @@ func (p *provider) ValidatePasscode(ctx context.Context, passcode string, id str
if err != nil { if err != nil {
return false, fmt.Errorf("error while getting user details") return false, fmt.Errorf("error while getting user details")
} }
status := totp.Validate(passcode, *user.TotpSecret)
// validate passcode inputted by user if !user.TotpVerified {
for {
status := totp.Validate(passcode, *user.TotpSecret)
if status { if status {
user.TotpVerified = true
p.UpdateUser(ctx, user)
return status, nil return status, nil
} }
return status, nil
} }
} return status, nil
func (p *provider) GenerateKeysTOTP() (*rsa.PublicKey, error) {
key := os.Getenv("TOTP_PRIVATE_KEY")
var privateKey *rsa.PrivateKey
if key == "" {
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
if err != nil {
return nil, err
}
privateKeyPEM := encodePrivateKeyToPEM(privateKey)
os.Setenv("TOTP_PRIVATE_KEY", string(privateKeyPEM))
}
publicKey := privateKey.PublicKey
return &publicKey, nil
}
func encodePrivateKeyToPEM(privateKey *rsa.PrivateKey) []byte {
// Marshal the private key to DER format.
privateKeyBytes := x509.MarshalPKCS1PrivateKey(privateKey)
// Create a PEM block for the private key.
privateKeyPEMBlock := &pem.Block{
Type: "RSA PRIVATE KEY",
Bytes: privateKeyBytes,
}
// Encode the PEM block to PEM format.
privateKeyPEM := pem.EncodeToMemory(privateKeyPEMBlock)
return privateKeyPEM
} }

47
server/db/providers/provider_template/totp.go
View File

@ -3,13 +3,8 @@ package provider_template
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
"encoding/pem"
"fmt" "fmt"
"image/png" "image/png"
"os"
"time" "time"
"github.com/pquerna/otp/totp" "github.com/pquerna/otp/totp"
@ -62,44 +57,14 @@ func (p *provider) ValidatePasscode(ctx context.Context, passcode string, id str
if err != nil { if err != nil {
return false, fmt.Errorf("error while getting user details") return false, fmt.Errorf("error while getting user details")
} }
status := totp.Validate(passcode, *user.TotpSecret)
// validate passcode inputted by user if !user.TotpVerified {
for {
status := totp.Validate(passcode, *user.TotpSecret)
if status { if status {
user.TotpVerified = true
p.UpdateUser(ctx, user)
return status, nil return status, nil
} }
return status, nil
} }
} return status, nil
func (p *provider) GenerateKeysTOTP() (*rsa.PublicKey, error) {
key := os.Getenv("TOTP_PRIVATE_KEY")
var privateKey *rsa.PrivateKey
if key == "" {
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
if err != nil {
return nil, err
}
privateKeyPEM := encodePrivateKeyToPEM(privateKey)
os.Setenv("TOTP_PRIVATE_KEY", string(privateKeyPEM))
}
publicKey := privateKey.PublicKey
return &publicKey, nil
}
func encodePrivateKeyToPEM(privateKey *rsa.PrivateKey) []byte {
// Marshal the private key to DER format.
privateKeyBytes := x509.MarshalPKCS1PrivateKey(privateKey)
// Create a PEM block for the private key.
privateKeyPEMBlock := &pem.Block{
Type: "RSA PRIVATE KEY",
Bytes: privateKeyBytes,
}
// Encode the PEM block to PEM format.
privateKeyPEM := pem.EncodeToMemory(privateKeyPEMBlock)
return privateKeyPEM
} }

22
server/db/providers/sql/totp.go
View File

@ -3,8 +3,6 @@ package sql
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/rand"
"crypto/rsa"
"fmt" "fmt"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"image/png" "image/png"
@ -60,18 +58,14 @@ func (p *provider) ValidatePasscode(ctx context.Context, passcode string, id str
if err != nil { if err != nil {
return false, fmt.Errorf("error while getting user details") return false, fmt.Errorf("error while getting user details")
} }
// validate passcode inputted by user
status := totp.Validate(passcode, *user.TotpSecret) status := totp.Validate(passcode, *user.TotpSecret)
if !user.TotpVerified {
if status {
user.TotpVerified = true
p.UpdateUser(ctx, user)
return status, nil
}
return status, nil
}
return status, nil return status, nil
} }
func (p *provider) GenerateKeysTOTP() (*rsa.PublicKey, error) {
privateKey, err := rsa.GenerateKey(rand.Reader, 1024)
if err != nil {
return nil, err
}
publicKey := privateKey.PublicKey
return &publicKey, nil
}

22
server/resolvers/login.go
View File

@ -3,6 +3,7 @@ package resolvers
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/authorizerdev/authorizer/server/crypto"
"strings" "strings"
"time" "time"
@ -161,7 +162,21 @@ func LoginResolver(ctx context.Context, params model.LoginInput) (*model.AuthRes
} }
if !isMFADisabled && refs.BoolValue(user.IsMultiFactorAuthEnabled) && !isTOTPLoginDisabled { if !isMFADisabled && refs.BoolValue(user.IsMultiFactorAuthEnabled) && !isTOTPLoginDisabled {
if user.TotpSecret == nil { pubKey, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyJwtPublicKey)
if err != nil {
log.Debug("error while getting public key")
}
publicKey, err := crypto.ParseRsaPublicKeyFromPemStr(pubKey)
if err != nil {
log.Debug("error while parsing public key")
}
encryptedUserId, err := crypto.EncryptRSA(user.ID, *publicKey)
if err != nil {
log.Debug("error while encrypting user id")
}
if !user.TotpVerified {
base64URL, err := db.Provider.GenerateTotp(ctx, user.ID) base64URL, err := db.Provider.GenerateTotp(ctx, user.ID)
if err != nil { if err != nil {
log.Debug("error while generating base64 url: ", err) log.Debug("error while generating base64 url: ", err)
@ -170,14 +185,13 @@ func LoginResolver(ctx context.Context, params model.LoginInput) (*model.AuthRes
res = &model.AuthResponse{ res = &model.AuthResponse{
Message: `Proceed to totp screen`, Message: `Proceed to totp screen`,
TotpBase64url: base64URL, TotpBase64url: base64URL,
TokenTotp: &user.ID, TokenTotp: &encryptedUserId,
} }
return res, nil return res, nil
} else { } else {
//res.TokenTotp = &user.ID
res = &model.AuthResponse{ res = &model.AuthResponse{
Message: `Proceed to totp screen`, Message: `Proceed to totp screen`,
TokenTotp: &user.ID, TokenTotp: &encryptedUserId,
} }
return res, nil return res, nil
} }

18
server/resolvers/verify_totp.go
View File

@ -3,6 +3,7 @@ package resolvers
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/authorizerdev/authorizer/server/crypto"
"strings" "strings"
"time" "time"
@ -24,7 +25,22 @@ import (
func VerifyTotpResolver(ctx context.Context, params model.VerifyTOTPRequest) (*model.AuthResponse, error) { func VerifyTotpResolver(ctx context.Context, params model.VerifyTOTPRequest) (*model.AuthResponse, error) {
var res *model.AuthResponse var res *model.AuthResponse
userID := params.Token encryptedkey := params.Token
pvtKey, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyJwtPrivateKey)
if err != nil {
log.Debug("error while getting private key")
}
privateKey, err := crypto.ParseRsaPrivateKeyFromPemStr(pvtKey)
if err != nil {
log.Debug("error while parsing private key")
}
userID, err := crypto.DecryptRSA(encryptedkey, *privateKey)
if err != nil {
log.Debug("error while decrypting userId")
}
gc, err := utils.GinContextFromContext(ctx) gc, err := utils.GinContextFromContext(ctx)
if err != nil { if err != nil {

1
server/test/integration_test.go
View File

@ -141,6 +141,7 @@ func TestResolvers(t *testing.T) {
inviteUserTest(t, s) inviteUserTest(t, s)
validateJwtTokenTest(t, s) validateJwtTokenTest(t, s)
verifyOTPTest(t, s) verifyOTPTest(t, s)
verifyTOTPTest(t, s)
resendOTPTest(t, s) resendOTPTest(t, s)
validateSessionTests(t, s) validateSessionTests(t, s)

76
server/test/verify_totp_test.go Normal file
View File

@ -0,0 +1,76 @@
package test
import (
"testing"
)
func verifyTOTPTest(t *testing.T, s TestSetup) {
//t.Helper()
//t.Run(`should verify totp`, func(t *testing.T) {
// req, ctx := createContext(s)
// email := "verify_otp." + s.TestInfo.Email
// res, err := resolvers.SignupResolver(ctx, model.SignUpInput{
// Email: email,
// Password: s.TestInfo.Password,
// ConfirmPassword: s.TestInfo.Password,
// })
// assert.NoError(t, err)
// assert.NotNil(t, res)
//
// // Login should fail as email is not verified
// loginRes, err := resolvers.LoginResolver(ctx, model.LoginInput{
// Email: email,
// Password: s.TestInfo.Password,
// })
// assert.Error(t, err)
// assert.Nil(t, loginRes)
// verificationRequest, err := db.Provider.GenerateTotp(ctx, loginRes.User.ID)
// assert.Nil(t, err)
// assert.Equal(t, email, verificationRequest.Email)
// verifyRes, err := resolvers.VerifyEmailResolver(ctx, model.VerifyEmailInput{
// Token: verificationRequest.Token,
// })
// assert.Nil(t, err)
// assert.NotEqual(t, verifyRes.AccessToken, "", "access token should not be empty")
//
// // Using access token update profile
// s.GinContext.Request.Header.Set("Authorization", "Bearer "+refs.StringValue(verifyRes.AccessToken))
// ctx = context.WithValue(req.Context(), "GinContextKey", s.GinContext)
// updateProfileRes, err := resolvers.UpdateProfileResolver(ctx, model.UpdateProfileInput{
// IsMultiFactorAuthEnabled: refs.NewBoolRef(true),
// })
// assert.NoError(t, err)
// assert.NotEmpty(t, updateProfileRes.Message)
//
// // Login should not return error but access token should be empty as otp should have been sent
// loginRes, err = resolvers.LoginResolver(ctx, model.LoginInput{
// Email: email,
// Password: s.TestInfo.Password,
// })
// assert.NoError(t, err)
// assert.NotNil(t, loginRes)
// assert.Nil(t, loginRes.AccessToken)
//
// // Get otp from db
// otp, err := db.Provider.GetOTPByEmail(ctx, email)
// assert.NoError(t, err)
// assert.NotEmpty(t, otp.Otp)
// // Get user by email
// user, err := db.Provider.GetUserByEmail(ctx, email)
// assert.NoError(t, err)
// assert.NotNil(t, user)
// // Set mfa cookie session
// mfaSession := uuid.NewString()
// memorystore.Provider.SetMfaSession(user.ID, mfaSession, time.Now().Add(1*time.Minute).Unix())
// cookie := fmt.Sprintf("%s=%s;", constants.MfaCookieName+"_session", mfaSession)
// cookie = strings.TrimSuffix(cookie, ";")
// req.Header.Set("Cookie", cookie)
// verifyOtpRes, err := resolvers.VerifyOtpResolver(ctx, model.VerifyOTPRequest{
// Email: &email,
// Otp: otp.Otp,
// })
// assert.Nil(t, err)
// assert.NotEqual(t, verifyOtpRes.AccessToken, "", "access token should not be empty")
// cleanData(email)
//})
}