Merge pull request #99 from akakou/hotfix/ta-bugs

Hotfix/ta bugs
akakou · Sep 9, 2024 · e1690f3 · e1690f3
2 parents a0f1375 + 6df3d36
commit e1690f3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/ta/core.go b/ta/core.go
@@ -31,6 +31,7 @@ func DefaultConfig() (*TAConfig, error) {
 	domain := os.Getenv("RA_WEBS_TA_DOMAIN")
 	email := os.Getenv("RA_WEBS_SERVICE_EMAIL")
 	verifierBase := os.Getenv("RA_WEBS_VERIFIER_BASE")
+
 	if token == "" {
 		return nil, fmt.Errorf("%v", ERROR_TOKEN_NOT_SET)
 	}

diff --git a/ta/errors.go b/ta/errors.go
@@ -7,16 +7,10 @@ const (
 	ERROR_REQUEST_FAILED        = "request failed"
 	ERROR_READ_BODY             = "read body failed"
 	ERROR_STATUS_NOT_OK         = "status not ok"
-	ERROR_Verifier_BASE_PARSE   = "verifier base parse failed"
+	ERROR_VERIFIER_BASE_PARSE   = "verifier base parse failed"
 	ERROR_REPOSITORY_NOT_SET    = "failed to read RA_WEBS_TA_REPOSITORY"
 	ERROR_TOKEN_NOT_SET         = "failed to read RA_WEBS_SERVICE_TOKEN"
 	ERROR_DOMAIN_NOT_SET        = "failed to read RA_WEBS_TA_DOMAIN"
 	ERROR_EMAIL_NOT_SET         = "failed to read RA_WEBS_SERVICE_EMAIL"
-	ERROR_Verifier_BASE_NOT_SET = "failed to read RA_WEBS_VERIFIER_BASE"
+	ERROR_VERIFIER_BASE_NOT_SET = "failed to read RA_WEBS_VERIFIER_BASE"
 )
-
-// token := os.Getenv("RA_WEBS_SERVICE_TOKEN")
-// repository := os.Getenv("RA_WEBS_TA_REPOSITORY")
-// domain := os.Getenv("RA_WEBS_TA_DOMAIN")
-// email := os.Getenv("RA_WEBS_TA_EMAIL")
-// verifierBase := os.Getenv("RA_WEBS_VERIFIER_BASE")
diff --git a/ta/post.go b/ta/post.go
@@ -47,7 +47,7 @@ func (ta *TA) post(path string, reqBody any) (string, error) {
 
 	u, err := url.Parse(ta.config.Verifier)
 	if err != nil {
-		return "", fmt.Errorf("%v: %v", ERROR_Verifier_BASE_PARSE, err)
+		return "", fmt.Errorf("%v: %v", ERROR_VERIFIER_BASE_PARSE, err)
 	}
 
 	u.Path = path

diff --git a/ta/tls.go b/ta/tls.go
@@ -9,7 +9,7 @@ import (
 
 const CERT_DIER_CACHE = "./tmp/ra-webs.cache"
 
-func parsePemCertiifcate(raw []byte, privateKey *rsa.PrivateKey) (*tls.Certificate, error) {
+func parsePemCertificate(raw []byte, privateKey *rsa.PrivateKey) (*tls.Certificate, error) {
 	certs := make([][]byte, 0)
 
 	for block, rest := pem.Decode(raw); block != nil; block, rest = pem.Decode(rest) {
@@ -35,7 +35,7 @@ func (ap *TA) TLSConfig() (*tls.Config, error) {
 
 	resouce := IssueCertificate(ap.privateKey, ap.config.Domain, ap.config.Email)
 
-	cert, err := parsePemCertiifcate(resouce.Certificate, ap.privateKey)
+	cert, err := parsePemCertificate(resouce.Certificate, ap.privateKey)
 
 	if err != nil {
 		return nil, err
@@ -47,4 +47,3 @@ func (ap *TA) TLSConfig() (*tls.Config, error) {
 		},
 	}, nil
 }
-