fumiama/terasu-cloudflared
1
0
Fork 0
mirror of https://github.com/fumiama/terasu-cloudflared.git synced 2026-06-07 10:00:23 +08:00
Code Activity

AUTH-1136: addressing beta feedback

Browse Source
This commit is contained in:
Austin Cherry
2018-09-18 16:21:27 -05:00
committed by Areg Harutyunyan
parent 674eb33edc
commit 170f0acf4f
8 changed files with 119 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/cloudflared/encrypter/encrypt.go
View File

@@ -47,7 +47,7 @@ type Encrypter struct {
// New returns a new encrypter with initialized keypair
func New(privateKey, publicKey string) (*Encrypter, error) {
e := &Encrypter{}
key, pubKey, err := e.fetchOrGenerateKeys(privateKey, publicKey)
pubKey, key, err := e.fetchOrGenerateKeys(privateKey, publicKey)
if err != nil {
return nil, err
}
@@ -57,7 +57,7 @@ func New(privateKey, publicKey string) (*Encrypter, error) {
// PublicKey returns a base64 encoded public key. Useful for transport (like in HTTP requests)
func (e *Encrypter) PublicKey() string {
return base64.StdEncoding.EncodeToString(e.publicKey[:])
return base64.URLEncoding.EncodeToString(e.publicKey[:])
}
// Decrypt data that was encrypted using our publicKey. It will use our privateKey and the sender's publicKey to decrypt
@@ -122,7 +122,7 @@ func (e *Encrypter) fetchOrGenerateKeys(privateKey, publicKey string) (*[32]byte
} else if err != nil {
return nil, nil, err
}
return key, pub, nil
return pub, key, nil
}
// writeKey will write a key to disk in DER format (it's a standard pem key)
@@ -166,7 +166,7 @@ func (e *Encrypter) fetchKey(filename string) (*[32]byte, error) {
// decodePublicKey will base64 decode the provided key to the box representation
func (e *Encrypter) decodePublicKey(key string) (*[32]byte, error) {
pub, err := base64.StdEncoding.DecodeString(key)
pub, err := base64.URLEncoding.DecodeString(key)
if err != nil {
return nil, err
}