fix: null did crashing program

Author: Preloading

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	_ "net/http/pprof"
 
 	"github.com/Preloading/TwitterAPIBridge/config"
 	"github.com/Preloading/TwitterAPIBridge/db_controller"
@@ -13,6 +14,11 @@ var (
 )
 
 func main() {
+	// Enable pprof for debugging purposes
+	// go func() {
+	// 	log.Println(http.ListenAndServe("localhost:6060", nil))
+	// }()
+
 	var err error
 	configData, err = config.LoadConfig()
 	if err != nil {

twitterv1/auth.go

@@ -148,6 +148,7 @@ func GetAuthFromReq(c *fiber.Ctx) (*string, *string, *string, *string, error) {
 	var err error
 
 	isBasic := false
+	nodid := ""
 	var username string
 
 	// Define a regular expression to match the oauth_token
@@ -160,7 +161,7 @@ func GetAuthFromReq(c *fiber.Ctx) (*string, *string, *string, *string, error) {
 		var did *string
 		basicAuthUsernamePassword, err = cryption.Base64URLDecode(base64pass)
 		if err != nil {
-			return nil, &fallbackRoute, nil, nil, err
+			return &nodid, &fallbackRoute, nil, nil, err
 		}
 
 		// separate the username and password
@@ -174,32 +175,32 @@ func GetAuthFromReq(c *fiber.Ctx) (*string, *string, *string, *string, error) {
 			if err.Error() == "invalid credentials" {
 				// test if password is an app password thru regex
 				if !regexp.MustCompile(`^[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}$`).MatchString(authPassword) {
-					return nil, &fallbackRoute, nil, nil, errors.New("invalid app password")
+					return &nodid, &fallbackRoute, nil, nil, errors.New("invalid app password")
 				}
 
 				res, pds, err := blueskyapi.Authenticate(username, authPassword)
 				if err != nil {
-					return nil, &fallbackRoute, nil, nil, err
+					return &nodid, &fallbackRoute, nil, nil, err
 				}
 
 				access_token_expiry, err := cryption.GetJWTTokenExpirationUnix(res.AccessJwt)
 				if err != nil {
-					return nil, &fallbackRoute, nil, nil, errors.New("failed to get access token expiry")
+					return &nodid, &fallbackRoute, nil, nil, errors.New("failed to get access token expiry")
 				}
 				refresh_token_expiry, err := cryption.GetJWTTokenExpirationUnix(res.RefreshJwt)
 				if err != nil {
-					return nil, &fallbackRoute, nil, nil, errors.New("failed to get refresh token expiry")
+					return &nodid, &fallbackRoute, nil, nil, errors.New("failed to get refresh token expiry")
 				}
 
 				_, err = db_controller.StoreTokenBasic(res.DID, *pds, res.AccessJwt, res.RefreshJwt, username, authPassword, *access_token_expiry, *refresh_token_expiry)
 
 				if err != nil {
-					return nil, &fallbackRoute, nil, nil, err
+					return &nodid, &fallbackRoute, nil, nil, err
 				}
 
 				return &res.DID, pds, nil, &res.AccessJwt, nil // TODO: Maybe change the uuid to something for here?
 			} else {
-				return nil, &fallbackRoute, nil, nil, err
+				return &nodid, &fallbackRoute, nil, nil, err
 			}
 		}
 
@@ -208,7 +209,7 @@ func GetAuthFromReq(c *fiber.Ctx) (*string, *string, *string, *string, error) {
 		re := regexp.MustCompile(`oauth_token="([^"]+)"`)
 		matches := re.FindStringSubmatch(authHeader)
 		if len(matches) < 2 {
-			return nil, &fallbackRoute, nil, nil, errors.New("oauth token not found")
+			return &nodid, &fallbackRoute, nil, nil, errors.New("oauth token not found")
 		}
 
 		oauthToken := matches[1]
@@ -220,7 +221,7 @@ func GetAuthFromReq(c *fiber.Ctx) (*string, *string, *string, *string, error) {
 			tokenData, err = ConvertV1TokenToV2(oauthToken)
 
 			if err != nil {
-				return nil, &fallbackRoute, nil, nil, err
+				return &nodid, &fallbackRoute, nil, nil, err
 			}
 
 		} else {
@@ -229,18 +230,18 @@ func GetAuthFromReq(c *fiber.Ctx) (*string, *string, *string, *string, error) {
 			})
 
 			if err != nil {
-				return nil, &fallbackRoute, nil, nil, errors.New("invalid token")
+				return &nodid, &fallbackRoute, nil, nil, errors.New("invalid token")
 			}
 
 			if !token.Valid {
 				if tokenData.ServerIdentifier == "" {
-					return nil, &fallbackRoute, nil, nil, errors.New("invalid token")
+					return &nodid, &fallbackRoute, nil, nil, errors.New("invalid token")
 				} else if tokenData.ServerIdentifier != configData.ServerIdentifier {
-					return nil, &fallbackRoute, nil, nil, errors.New("incorrect server")
+					return &nodid, &fallbackRoute, nil, nil, errors.New("incorrect server")
 
 				}
 
-				return nil, &fallbackRoute, nil, nil, errors.New("invalid token")
+				return &nodid, &fallbackRoute, nil, nil, errors.New("invalid token")
 			}
 		}
 
@@ -257,7 +258,7 @@ func GetAuthFromReq(c *fiber.Ctx) (*string, *string, *string, *string, error) {
 		accessJwt, refreshJwt, access_expiry, refresh_expiry, userPDS, err = db_controller.GetToken(string(userDID), string(tokenUUID), encryptionKey, tokenType) // Use token version 2 for OAuth
 
 		if err != nil {
-			return nil, &fallbackRoute, nil, nil, err
+			return &nodid, &fallbackRoute, nil, nil, err
 		}
 	}
 
@@ -293,25 +294,25 @@ func GetAuthFromReq(c *fiber.Ctx) (*string, *string, *string, *string, error) {
 			} else {
 				db_controller.DeleteToken(string(userDID), string(tokenUUID))
 			}
-			return nil, &fallbackRoute, nil, nil, errors.New("refresh token has expired")
+			return &nodid, &fallbackRoute, nil, nil, errors.New("refresh token has expired")
 		}
 
 		// Our refresh token is still valid. Lets refresh our access token.
 		new_auth, err := blueskyapi.RefreshToken(*userPDS, *refreshJwt)
 
 		if err != nil {
-			return nil, &fallbackRoute, nil, nil, err
+			return &nodid, &fallbackRoute, nil, nil, err
 		}
 
 		accessJwt = &new_auth.AccessJwt
 
 		access_token_expiry, err := cryption.GetJWTTokenExpirationUnix(new_auth.AccessJwt)
 		if err != nil {
-			return nil, &fallbackRoute, nil, nil, errors.New("failed to get access token expiry")
+			return &nodid, &fallbackRoute, nil, nil, errors.New("failed to get access token expiry")
 		}
 		refresh_token_expiry, err := cryption.GetJWTTokenExpirationUnix(new_auth.RefreshJwt)
 		if err != nil {
-			return nil, &fallbackRoute, nil, nil, errors.New("failed to get refresh token expiry")
+			return &nodid, &fallbackRoute, nil, nil, errors.New("failed to get refresh token expiry")
 		}
 
 		// TODO: Recheck if the user id is still bound to that PDS