Merge pull request #210 from rubixchain/gklps/tokenVerificationEnh

Token Verification Client Enhancements

client/token.go

@@ -70,3 +70,15 @@ func (c *Client) ValidateTokenchain(userDID string, smartContractChainValidation
 	}
 	return &br, nil
 }
+
+func (c *Client) ValidateToken(token string) (*model.BasicResponse, error) {
+	q := make(map[string]string)
+	q["token"] = token
+
+	var br model.BasicResponse
+	err := c.sendJSONRequest("GET", setup.APIValidateToken, q, nil, &br)
+	if err != nil {
+		return nil, err
+	}
+	return &br, nil
+}

command/command.go

@@ -92,6 +92,7 @@ const (
 	PinTokenCmd                    string = "pinToken"
 	RecoverTokensCmd               string = "recoverToken"
 	ValidateTokenchainCmd          string = "validatetokenchain"
+	ValidateTokenCmd               string = "validatetoken"
 )
 
 var commands = []string{VersionCmd,
@@ -146,6 +147,7 @@ var commands = []string{VersionCmd,
 	RecoverTokensCmd,
 	CheckQuorumStatusCmd,
 	ValidateTokenchainCmd,
+	ValidateTokenCmd,
 }
 
 var commandsHelp = []string{"To get tool version",
@@ -196,6 +198,11 @@ var commandsHelp = []string{"To get tool version",
 	"This command will initiate a self RBT transfer",
 	"This command will unpledge all the pledged tokens",
 	"This command will unpledge all PoW based pledge tokens and drop the unpledgequeue table",
+	"This command will pin the token",
+	"This command will recover the token",
+	"This command will check the quorum status",
+	"This command will validate the token chain",
+	"This command will validate the token",
 }
 
 type Command struct {
@@ -655,6 +662,8 @@ func Run(args []string) {
 		cmd.RecoverTokens()
 	case ValidateTokenchainCmd:
 		cmd.ValidateTokenchain()
+	case ValidateTokenCmd:
+		cmd.ValidateToken()
 	default:
 		cmd.log.Error("Invalid command")
 	}

command/token.go

@@ -70,3 +70,27 @@ func (cmd *Command) ValidateTokenchain() {
 
 	cmd.log.Info("Tokenchain validated successfully", "msg", br.Message)
 }
+
+func (cmd *Command) ValidateToken() {
+	if cmd.token == "" {
+		cmd.log.Info("Token cannot be empty")
+		fmt.Print("Enter Token : ")
+		_, err := fmt.Scan(&cmd.token)
+		if err != nil {
+			cmd.log.Error("Failed to get tokenhash")
+			return
+		}
+	}
+	br, err := cmd.c.ValidateToken(cmd.token)
+	if err != nil {
+		cmd.log.Error("failed to validate token", "err", err)
+		return
+	}
+
+	if !br.Status {
+		cmd.log.Error("failed to validate token %s", cmd.token, "msg", br.Message)
+		return
+	}
+	cmd.log.Info("Token %s validated successfully ", cmd.token, "msg", br.Message)
+
+}

core/core.go

@@ -54,6 +54,7 @@ const (
 	APISelfTransfer           string = "/api/self-transfer"
 	APIRecoverPinnedRBT       string = "/api/recover-pinned-rbt"
 	APIRequestSigningHash     string = "/api/request-signing-hash"
+	TokenValidatorURL         string = "http://103.209.145.177:8000"
 )
 
 const (

core/token.go

@@ -2,7 +2,9 @@ package core
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -34,6 +36,16 @@ type TCBSyncReply struct {
 	TCBlock     [][]byte `json:"tc_block"`
 }
 
+// TokenVerificationRequest struct
+type TokenVerificationRequest struct {
+	Tokens []string `json:"tokens"`
+}
+
+// TokenVerificationResponse struct
+type TokenVerificationResponse struct {
+	Results map[string]bool `json:"results"`
+}
+
 func (c *Core) SetupToken() {
 	c.l.AddRoute(APISyncTokenChain, "POST", c.syncTokenChain)
 }
@@ -528,3 +540,88 @@ func (c *Core) GetpinnedTokens(did string) ([]wallet.Token, error) {
 	}
 	return requiredTokens, nil
 }
+
+func (c *Core) ValidateToken(token string) (*model.BasicResponse, error) {
+
+	response := &model.BasicResponse{
+		Status:  false,
+		Message: "Invalid token hash",
+	}
+
+	// commented out for now, #TODO
+	/* if c.testNet {
+		response.Message = "validate token is not available in test net"
+		response.Result = "invalid operation"
+		return response, fmt.Errorf("validate token is not available in test net")
+	} */
+	// Get token hash from IPFS
+	tokenHashReader, err := c.ipfs.Cat(token)
+	if err != nil {
+		return response, fmt.Errorf("error getting token hash from IPFS: %v", err)
+	}
+	defer tokenHashReader.Close()
+
+	// Read token hash from io.ReadCloser
+	var tokenHashBuf bytes.Buffer
+	if _, err := io.Copy(&tokenHashBuf, tokenHashReader); err != nil {
+		return response, fmt.Errorf("error reading token hash: %v", err)
+	}
+	tokenHash := tokenHashBuf.String()
+	// Trim any leading/trailing whitespace, including newlines
+	tokenHash = strings.TrimSpace(tokenHash)
+	/*
+		// Length check (should be 67 characters as per your requirements)
+		if len(tokenHash) != 67 {
+			return response, fmt.Errorf("invalid token length: %s, length is %v", tokenHash, len(tokenHash))
+		} */
+
+	// Call the VerifyTokens function from the tokenverifier package
+	verifyResponse, err := VerifyTokens(TokenValidatorURL, []string{tokenHash})
+	if err != nil {
+		return response, fmt.Errorf("token verification API call failed: %v", err)
+	}
+
+	// Check the result from the API response
+	isValid, tokenFound := verifyResponse.Results[tokenHash]
+	if !tokenFound {
+		return response, fmt.Errorf("token not found in verification response")
+	}
+
+	if isValid {
+		response.Status = true
+		response.Message = fmt.Sprintf("Token %s is valid", token)
+	} else {
+		response.Message = fmt.Sprintf("Token %s is invalid", token)
+	}
+
+	return response, nil
+}
+
+// VerifyTokens function sends the API request and handles the response
+func VerifyTokens(serverURL string, tokens []string) (TokenVerificationResponse, error) {
+	url := fmt.Sprintf("%s/verify", serverURL)
+
+	requestBody := TokenVerificationRequest{Tokens: tokens}
+	jsonData, err := json.Marshal(requestBody)
+	if err != nil {
+		return TokenVerificationResponse{}, fmt.Errorf("error marshalling request: %v", err)
+	}
+
+	resp, err := http.Post(url, "application/json", bytes.NewBuffer(jsonData))
+	if err != nil {
+		return TokenVerificationResponse{}, fmt.Errorf("error sending request: %v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return TokenVerificationResponse{}, fmt.Errorf("API request failed with status: %d", resp.StatusCode)
+	}
+
+	var responseBody TokenVerificationResponse
+	err = json.NewDecoder(resp.Body).Decode(&responseBody)
+	if err != nil {
+		return TokenVerificationResponse{}, fmt.Errorf("error decoding response: %v", err)
+	}
+
+	return responseBody, nil
+}

server/server.go

@@ -169,6 +169,7 @@ func (s *Server) RegisterRoutes() {
 	s.AddRoute(setup.APIInitiatePinRBT, "POST", s.AuthHandle(s.APIInitiatePinRBT, true, s.AuthError, false))
 	s.AddRoute(setup.APIRecoverRBT, "POST", s.AuthHandle(s.APIRecoverRBT, true, s.AuthError, false))
 	s.AddRoute(setup.APIValidateTokenChain, "GET", s.AuthHandle(s.APIValidateTokenChain, false, s.AuthError, false))
+	s.AddRoute(setup.APIValidateToken, "GET", s.AuthHandle(s.APIValidateToken, false, s.AuthError, false))
 }
 
 func (s *Server) ExitFunc() error {

server/tokens.go

@@ -340,3 +340,13 @@ func (s *Server) APIValidateTokenChain(req *ensweb.Request) *ensweb.Result {
 
 	return s.RenderJSON(req, br, http.StatusOK)
 }
+
+func (s *Server) APIValidateToken(req *ensweb.Request) *ensweb.Result {
+	token := s.GetQuerry(req, "token")
+	br, err := s.c.ValidateToken(token)
+	if err != nil {
+		s.log.Error("Failed to validate token ", err)
+		return s.BasicResponse(req, false, "Failed to validate token : "+err.Error(), nil)
+	}
+	return s.RenderJSON(req, br, http.StatusOK)
+}

setup/setup.go

@@ -76,6 +76,7 @@ const (
 	APIInitiatePinRBT                   string = "/api/initiate-pin-token"
 	APIRecoverRBT                       string = "/api/recover-token"
 	APIValidateTokenChain               string = "/api/validate-token-chain"
+	APIValidateToken                    string = "/api/validate-token"
 )
 
 // jwt.RegisteredClaims