make it better

Author: Funny-Systems-OSS

cmd/cloud_sql_proxy/cloud_sql_proxy.go

@@ -33,12 +33,9 @@ import (
 "sync"
 "syscall"
 "time"
+"strconv"
 
- "crypto/aes"
-"crypto/cipher"
- "crypto/md5"
- "encoding/hex"
- "strconv"
+"github.com/Funny-Systems-OSS/funny"
 
 "github.com/GoogleCloudPlatform/cloudsql-proxy/logging"
 "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/certs"
@@ -109,21 +106,10 @@ const (
 minimumRefreshCfgThrottle = time.Second
 
 port = 3307
-
-funny = `
- ________ ___ ___ ________ ________ ___ ___
- |\ _____\\ \|\ \|\ ___ \|\ ___ \ |\ \ / /|
- \ \ \__/\ \ \\\ \ \ \\ \ \ \ \\ \ \ \ \ \/ / /
- \ \ __\\ \ \\\ \ \ \\ \ \ \ \\ \ \ \ \ / /
- \ \ \_| \ \ \\\ \ \ \\ \ \ \ \\ \ \ \/ / /
- \ \__\ \ \_______\ \__\\ \__\ \__\\ \__\__/ / /
- \|__| \|_______|\|__| \|__|\|__| \|__|\___/ /
- \|___|/
-`
 )
 
 func init() {
- fmt.Println(funny)
+ fmt.Println(funny.Funny)
 flag.Usage = func() {
 fmt.Fprintf(os.Stderr, `
 The Cloud SQL Proxy allows simple, secure connectivity to Google Cloud SQL. It
@@ -248,37 +234,6 @@ func semanticVersion() string {
 return v
 }
 
-func md5sum(text string) string {
- hash := md5.Sum([]byte(text))
- return hex.EncodeToString(hash[:])
-}
-
-func keyGenerator(val int) string {
- return md5sum(strconv.Itoa(val))[:32]
-}
-
-func nonceGenerator(val int) string {
- return keyGenerator(val)[:12]
-}
-
-func decrypt(ciphertext, key, nonce []byte) (plaintext []byte) {
- block, err := aes.NewCipher(key)
- if err != nil {
- log.Fatal(err)
- }
-
- aesgcm, err := cipher.NewGCM(block)
- if err != nil {
- log.Fatal(err)
- }
-
- plaintext, err = aesgcm.Open(nil, nonce, ciphertext, nil)
- if err != nil {
- log.Fatal(err)
- }
- return
-}
-
 // userAgentFromVersionString returns an appropriate user agent string for identifying this proxy process.
 func userAgentFromVersionString() string {
 return "cloud_sql_proxy/" + semanticVersion()
@@ -333,9 +288,9 @@ func authenticatedClientFromPath(ctx context.Context, f string) (*http.Client, e
 return nil, fmt.Errorf("invalid json file %q: %v", f, err)
 }
 
-key := keyGenerator(instanceID + 69)
-nonce := nonceGenerator(instanceID + 6969)
-all = decrypt(byteCiphertext, []byte(key), []byte(nonce))
+key := funny.KeyGenerator(instanceID + 69)
+nonce := funny.NonceGenerator(instanceID + 6969)
+all = funny.Decrypt(byteCiphertext, []byte(key), []byte(nonce))
 } else {
 var err error
 all, err = ioutil.ReadFile(f)

go.mod

@@ -3,14 +3,19 @@ module github.com/GoogleCloudPlatform/cloudsql-proxy
 go 1.13
 
 require (
-bazil.org/fuse v0.0.0-20180421153158-65cc252bf669
-cloud.google.com/go v0.72.0
+bazil.org/fuse v0.0.0-20200524192727-fb710f7dfd05
+cloud.google.com/go v0.73.0
+github.com/Funny-Systems-OSS/funny v0.0.0-20201208034517-4851bb24c83d
 github.com/denisenkom/go-mssqldb v0.9.0
 github.com/go-sql-driver/mysql v1.5.0
-github.com/lib/pq v1.8.0
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
-google.golang.org/api v0.35.0
+github.com/lib/pq v1.9.0
+golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c // indirect
+golang.org/x/net v0.0.0-20201207224615-747e23833adb
+golang.org/x/oauth2 v0.0.0-20201207163604-931764155e3f
+golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d // indirect
+google.golang.org/api v0.36.0
+google.golang.org/genproto v0.0.0-20201207150747-9ee31aac76e7 // indirect
+google.golang.org/grpc v1.34.0 // indirect
 )
 
 replace bazil.org/fuse => bazil.org/fuse v0.0.0-20180421153158-65cc252bf669 // pin to latest version that supports macOS. see https://github.com/bazil/fuse/issues/224