luzifer/envrun
1
0
Fork 0
mirror of https://github.com/Luzifer/envrun.git synced 2024-12-20 18:31:17 +00:00
Code Issues Releases Wiki Activity

Update OpenSSL library, add CLI support for openssl-sha256

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2018-11-02 21:40:47 +01:00
parent 9315fca1ea
commit 7b474991d6
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gopkg.toml
View file

@ -25,6 +25,10 @@
# unused-packages = true # unused-packages = true
[[constraint]]
name = "github.com/Luzifer/go-openssl"
version = "3.0.0"
[[constraint]] [[constraint]]
name = "github.com/Luzifer/rconfig" name = "github.com/Luzifer/rconfig"
version = "1.1.0" version = "1.1.0"

14
decryption.go
View file

@ -6,9 +6,10 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
openssl "github.com/Luzifer/go-openssl"
"golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/armor" "golang.org/x/crypto/openpgp/armor"
openssl "github.com/Luzifer/go-openssl"
) )
type decryptMethod func(body []byte, passphrase string) ([]byte, error) type decryptMethod func(body []byte, passphrase string) ([]byte, error)
@ -20,7 +21,10 @@ func decryptMethodFromName(name string) (decryptMethod, error) {
return decryptGPGSymmetric, nil return decryptGPGSymmetric, nil
case "openssl-md5": case "openssl-md5":
return decryptOpenSSLMD5, nil return decryptOpenSSL(openssl.DigestMD5Sum), nil
case "openssl-sha256":
return decryptOpenSSL(openssl.DigestSHA256Sum), nil
default: default:
return nil, fmt.Errorf("Decrypt method %q not found", name) return nil, fmt.Errorf("Decrypt method %q not found", name)
@ -56,6 +60,8 @@ func decryptGPGSymmetric(body []byte, passphrase string) ([]byte, error) {
return ioutil.ReadAll(md.UnverifiedBody) return ioutil.ReadAll(md.UnverifiedBody)
} }
func decryptOpenSSLMD5(body []byte, passphrase string) ([]byte, error) { func decryptOpenSSL(kdf openssl.DigestFunc) decryptMethod {
return openssl.New().DecryptString(cfg.Password, string(body)) return func(body []byte, passphrase string) ([]byte, error) {
return openssl.New().DecryptBytes(cfg.Password, body, kdf)
}
} }

5
main.go
View file

@ -7,14 +7,15 @@ import (
"os/exec" "os/exec"
"strings" "strings"
"github.com/Luzifer/rconfig"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/Luzifer/rconfig"
) )
var ( var (
cfg = struct { cfg = struct {
CleanEnv bool `flag:"clean" default:"false" description:"Do not pass current environment to child process"` CleanEnv bool `flag:"clean" default:"false" description:"Do not pass current environment to child process"`
EncryptionMethod string `flag:"encryption" default:"openssl-md5" description:"Encryption method used for encrypted env-file (Available: gpg-symmetric, openssl-md5)"` EncryptionMethod string `flag:"encryption" default:"openssl-md5" description:"Encryption method used for encrypted env-file (Available: gpg-symmetric, openssl-md5, openssl-sha256)"`
EnvFile string `flag:"env-file" default:".env" description:"Location of the environment file"` EnvFile string `flag:"env-file" default:".env" description:"Location of the environment file"`
LogLevel string `flag:"log-level" default:"info" description:"Log level (debug, info, warn, error, fatal)"` LogLevel string `flag:"log-level" default:"info" description:"Log level (debug, info, warn, error, fatal)"`
PasswordFile string `flag:"password-file" default:"" description:"Read encryption key from file"` PasswordFile string `flag:"password-file" default:"" description:"Read encryption key from file"`