GitHubMirror/MUTN
1
0
Fork 0
mirror of https://github.com/rwinkhart/MUTN.git synced 2026-08-28 04:46:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add current UNIX timestamp to generated GPG ID, identify key based on it

Browse Source
This commit is contained in:
RandyTheSilly
2024-03-08 10:36:01 -05:00
parent a0ca7803f1
commit f35d1b3741
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/init.go
+6 -6
View File
@@ -9,14 +9,14 @@ func TempInitCli() {
// gpgID // gpgID
var gpgID string var gpgID string
if inputBinary("Auto-generate GPG key?") { if inputBinary("Auto-generate GPG key?") {
offline.GpgKeyGen() gpgID = offline.GpgKeyGen()
} else {
// select GPG key from menu
uidSlice := offline.GpgUIDListGen()
gpgIDInt := inputMenuGen("Select GPG key:", uidSlice)
gpgID = uidSlice[gpgIDInt-1]
} }
// select GPG key
uidSlice := offline.GpgUIDListGen()
gpgIDInt := inputMenuGen("Select GPG key:", uidSlice)
gpgID = uidSlice[gpgIDInt-1]
// textEditor // textEditor
textEditor := input("Text editor (leave blank for $EDITOR, falls back to \"" + offline.FallbackEditor + "\"):") textEditor := input("Text editor (leave blank for $EDITOR, falls back to \"" + offline.FallbackEditor + "\"):")
src/offline/init.go
+8 -3
View File
@@ -3,7 +3,9 @@ package offline
import ( import (
"os" "os"
"os/exec" "os/exec"
"strconv"
"strings" "strings"
"time"
) )
// TempInit ensures libmutton directories exist and writes the libmutton configuration file // TempInit ensures libmutton directories exist and writes the libmutton configuration file
@@ -44,13 +46,14 @@ func GpgUIDListGen() []string {
return uidSlice return uidSlice
} }
// GpgKeyGen generates a new GPG key - it does not return it due to GPG's unreliable output // GpgKeyGen generates a new GPG key and returns the key ID
func GpgKeyGen() { func GpgKeyGen() string {
gpgGenTempFile := CreateTempFile() gpgGenTempFile := CreateTempFile()
defer os.Remove(gpgGenTempFile.Name()) defer os.Remove(gpgGenTempFile.Name())
// create and write gpg-gen file // create and write gpg-gen file
gpgGenTempFile.WriteString(strings.Join([]string{"Key-Type: eddsa", "Key-Curve: ed25519", "Key-Usage: sign", "Subkey-Type: ecdh", "Subkey-Curve: cv25519", "Subkey-Usage: encrypt", "Name-Real: libmutton", "Name-Comment: gpg-libmutton", "Name-Email: github.com/rwinkhart/libmutton", "Expire-Date: 0"}, "\n")) unixTime := strconv.FormatInt(time.Now().Unix(), 10)
gpgGenTempFile.WriteString(strings.Join([]string{"Key-Type: eddsa", "Key-Curve: ed25519", "Key-Usage: sign", "Subkey-Type: ecdh", "Subkey-Curve: cv25519", "Subkey-Usage: encrypt", "Name-Real: libmutton-" + unixTime, "Name-Comment: gpg-libmutton", "Name-Email: github.com/rwinkhart/libmutton", "Expire-Date: 0"}, "\n"))
// generate GPG key based on gpg-gen file // generate GPG key based on gpg-gen file
cmd := exec.Command("gpg", "-q", "--batch", "--generate-key", gpgGenTempFile.Name()) cmd := exec.Command("gpg", "-q", "--batch", "--generate-key", gpgGenTempFile.Name())
@@ -58,4 +61,6 @@ func GpgKeyGen() {
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
cmd.Stdin = os.Stdin cmd.Stdin = os.Stdin
cmd.Run() cmd.Run()
return "libmutton-" + unixTime + " (gpg-libmutton) <github.com/rwinkhart/libmutton>"
} }