From ea7286c875351a517b2847abb32c7f590ae38541 Mon Sep 17 00:00:00 2001
From: Pavel Korotkov <pkorotkov@gmail.com>
Date: Tue, 21 Jul 2020 12:40:46 +0300
Subject: [PATCH] Split code into smaller parts within the auth package

---
 auth/center.go       | 51 +-------------------------------------------
 auth/regexp-utils.go | 19 +++++++++++++++++
 auth/rsa-utils.go    | 42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 50 deletions(-)
 create mode 100644 auth/regexp-utils.go
 create mode 100644 auth/rsa-utils.go

diff --git a/auth/center.go b/auth/center.go
index 801f6074..1a163a09 100644
--- a/auth/center.go
+++ b/auth/center.go
@@ -4,12 +4,8 @@ import (
 	"bytes"
 	"context"
 	"crypto/ecdsa"
-	"crypto/rand"
 	"crypto/rsa"
-	"crypto/sha256"
-	"crypto/x509"
 	"encoding/hex"
-	"encoding/pem"
 	"io/ioutil"
 	"net/http"
 	"regexp"
@@ -189,6 +185,7 @@ func (center *Center) AuthenticationPassed(request *http.Request) (*service.Bear
 	return bearerToken, nil
 }
 
+// TODO: Make this write into a smart buffer backed by a file on a fast drive.
 func readAndKeepBody(request *http.Request) (*bytes.Reader, error) {
 	if request.Body == nil {
 		var r bytes.Reader
@@ -209,49 +206,3 @@ func (center *Center) compress(data []byte) []byte {
 func (center *Center) decompress(data []byte) ([]byte, error) {
 	return center.zstdDecoder.DecodeAll(data, nil)
 }
-
-func encrypt(key *rsa.PublicKey, data []byte) ([]byte, error) {
-	return rsa.EncryptOAEP(sha256.New(), rand.Reader, key, data, []byte{})
-}
-
-func decrypt(key *rsa.PrivateKey, data []byte) ([]byte, error) {
-	return rsa.DecryptOAEP(sha256.New(), rand.Reader, key, data, []byte{})
-}
-
-func sha256Hash(data []byte) []byte {
-	hash := sha256.New()
-	hash.Write(data)
-	return hash.Sum(nil)
-}
-
-func ReadRSAPrivateKeyFromPEMFile(filePath string) (*rsa.PrivateKey, error) {
-	kbs, err := ioutil.ReadFile(filePath)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to read file %s", filePath)
-	}
-	pemBlock, _ := pem.Decode(kbs)
-	if pemBlock == nil {
-		return nil, errors.Errorf("failed to decode PEM data from file %s", filePath)
-	}
-	rsaKey, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to parse private key bytes from pem data from file %s", filePath)
-	}
-	return rsaKey, nil
-}
-
-type regexpSubmatcher struct {
-	re *regexp.Regexp
-}
-
-func (resm *regexpSubmatcher) getSubmatches(target string) map[string]string {
-	matches := resm.re.FindStringSubmatch(target)
-	l := len(matches)
-	submatches := make(map[string]string, l)
-	for i, name := range resm.re.SubexpNames() {
-		if i > 0 && i <= l {
-			submatches[name] = matches[i]
-		}
-	}
-	return submatches
-}
diff --git a/auth/regexp-utils.go b/auth/regexp-utils.go
new file mode 100644
index 00000000..94ba85d1
--- /dev/null
+++ b/auth/regexp-utils.go
@@ -0,0 +1,19 @@
+package auth
+
+import "regexp"
+
+type regexpSubmatcher struct {
+	re *regexp.Regexp
+}
+
+func (resm *regexpSubmatcher) getSubmatches(target string) map[string]string {
+	matches := resm.re.FindStringSubmatch(target)
+	l := len(matches)
+	submatches := make(map[string]string, l)
+	for i, name := range resm.re.SubexpNames() {
+		if i > 0 && i <= l {
+			submatches[name] = matches[i]
+		}
+	}
+	return submatches
+}
diff --git a/auth/rsa-utils.go b/auth/rsa-utils.go
new file mode 100644
index 00000000..cd1e7562
--- /dev/null
+++ b/auth/rsa-utils.go
@@ -0,0 +1,42 @@
+package auth
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha256"
+	"crypto/x509"
+	"encoding/pem"
+	"io/ioutil"
+
+	"github.com/pkg/errors"
+)
+
+func ReadRSAPrivateKeyFromPEMFile(filePath string) (*rsa.PrivateKey, error) {
+	kbs, err := ioutil.ReadFile(filePath)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to read file %s", filePath)
+	}
+	pemBlock, _ := pem.Decode(kbs)
+	if pemBlock == nil {
+		return nil, errors.Errorf("failed to decode PEM data from file %s", filePath)
+	}
+	rsaKey, err := x509.ParsePKCS1PrivateKey(pemBlock.Bytes)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to parse private key bytes from pem data from file %s", filePath)
+	}
+	return rsaKey, nil
+}
+
+func encrypt(key *rsa.PublicKey, data []byte) ([]byte, error) {
+	return rsa.EncryptOAEP(sha256.New(), rand.Reader, key, data, []byte{})
+}
+
+func decrypt(key *rsa.PrivateKey, data []byte) ([]byte, error) {
+	return rsa.DecryptOAEP(sha256.New(), rand.Reader, key, data, []byte{})
+}
+
+func sha256Hash(data []byte) []byte {
+	hash := sha256.New()
+	hash.Write(data)
+	return hash.Sum(nil)
+}