gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-13 02:01:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #778 from gravitl/hotfix_v0.10.0_jwt2

Browse source 
hotfix 2
This commit is contained in:
dcarns 2022-02-15 21:54:28 -05:00 • committed by GitHub
commit 4a32bb12f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
logic/jwts.go
View file

@ -17,7 +17,11 @@ var jwtSecretKey []byte
func SetJWTSecret() { func SetJWTSecret() {
currentSecret, jwtErr := FetchJWTSecret() currentSecret, jwtErr := FetchJWTSecret()
if jwtErr != nil { if jwtErr != nil {
jwtSecretKey = []byte(RandomString(64)) // 512 bit random password newValue, err := GenerateCryptoString(64)
if err != nil {
logger.FatalLog("something went wrong when generating JWT signature")
}
jwtSecretKey = []byte(newValue) // 512 bit random password
if err := StoreJWTSecret(string(jwtSecretKey)); err != nil { if err := StoreJWTSecret(string(jwtSecretKey)); err != nil {
logger.FatalLog("something went wrong when configuring JWT authentication") logger.FatalLog("something went wrong when configuring JWT authentication")
} }

37
logic/util.go
View file

@ -2,9 +2,11 @@
package logic package logic
import ( import (
crand "crypto/rand"
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"fmt" "fmt"
"math/big"
"math/rand" "math/rand"
"net" "net"
"os" "os"
@ -85,29 +87,20 @@ func SetNetworkNodesLastModified(networkName string) error {
return nil return nil
} }
// // GetNode - fetches a node from database // GenerateCryptoString - generates random string of n length
// func GetNode(macaddress string, network string) (models.Node, error) { func GenerateCryptoString(n int) (string, error) {
// var node models.Node const chars = "123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-"
ret := make([]byte, n)
for i := range ret {
num, err := crand.Int(crand.Reader, big.NewInt(int64(len(chars))))
if err != nil {
return "", err
}
ret[i] = chars[num.Int64()]
}
// key, err := GetRecordKey(macaddress, network) return string(ret), nil
// if err != nil { }
// return node, err
// }
// data, err := database.FetchRecord(database.NODES_TABLE_NAME, key)
// if err != nil {
// if data == "" {
// data, _ = database.FetchRecord(database.DELETED_NODES_TABLE_NAME, key)
// err = json.Unmarshal([]byte(data), &node)
// }
// return node, err
// }
// if err = json.Unmarshal([]byte(data), &node); err != nil {
// return node, err
// }
// SetNodeDefaults(&node)
// return node, err
// }
// DeleteNodeByID - deletes a node from database or moves into delete nodes table // DeleteNodeByID - deletes a node from database or moves into delete nodes table
func DeleteNodeByID(node *models.Node, exterminate bool) error { func DeleteNodeByID(node *models.Node, exterminate bool) error {