From ec38dea803192d90a83b996efa311ec766bc2882 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Mon, 26 Aug 2024 19:32:40 -0600
Subject: [PATCH] remove the force and duration options

---
 agent.go   | 12 +++++-------
 main.go    | 14 +++++---------
 privkey.go | 12 ++++--------
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/agent.go b/agent.go
index cee76ae..d51b305 100644
--- a/agent.go
+++ b/agent.go
@@ -31,12 +31,10 @@ type Traygent struct {
 	passphrase []byte
 	locked     bool
 
-	addChan       chan ssh.PublicKey
-	rmChan        chan string
-	sigReq        chan ssh.PublicKey
-	sigResp       chan bool
-	force         bool
-	forceDuration int
+	addChan chan ssh.PublicKey
+	rmChan  chan string
+	sigReq  chan ssh.PublicKey
+	sigResp chan bool
 }
 
 func (t *Traygent) log(_, msgFmt string, msg ...any) {
@@ -238,7 +236,7 @@ func (t *Traygent) Add(key agent.AddedKey) error {
 		return err
 	}
 
-	p := NewPrivKey(signer, key, t.force, t.forceDuration)
+	p := NewPrivKey(signer, key)
 
 	t.mu.RLock()
 	for _, k := range t.keys {
diff --git a/main.go b/main.go
index 12f2f73..b066e2b 100644
--- a/main.go
+++ b/main.go
@@ -24,8 +24,6 @@ func init() {
 func main() {
 	sock := flag.String("s", path.Join(os.Getenv("HOME"), ".traygent"), "Socket path to create")
 	cmdList := flag.String("c", "/etc/traygent.json", "List of commands to execute")
-	force := flag.Bool("f", true, "force expiration of keys")
-	forceDuration := flag.Int("d", 300, "seconds for forced expiration")
 	flag.Parse()
 
 	os.Remove(*sock)
@@ -48,13 +46,11 @@ func main() {
 
 	cmds := LoadCommands(*cmdList)
 	tagent := Traygent{
-		listener:      l,
-		addChan:       make(chan ssh.PublicKey),
-		rmChan:        make(chan string),
-		sigReq:        make(chan ssh.PublicKey),
-		sigResp:       make(chan bool),
-		force:         *force,
-		forceDuration: *forceDuration,
+		listener: l,
+		addChan:  make(chan ssh.PublicKey),
+		rmChan:   make(chan string),
+		sigReq:   make(chan ssh.PublicKey),
+		sigResp:  make(chan bool),
 	}
 
 	trayApp := app.NewWithID("com.bolddaemon.traygent")
diff --git a/privkey.go b/privkey.go
index 0cec8af..772b323 100644
--- a/privkey.go
+++ b/privkey.go
@@ -40,22 +40,18 @@ func (p *privKey) GetComment() string {
 	return p.comment
 }
 
-func (p *privKey) setExpire(key agent.AddedKey, force bool, duration int) {
+func (p *privKey) setExpire(key agent.AddedKey) {
 	exp := key.LifetimeSecs
 
-	if force && exp <= 0 {
-		exp = uint32(duration)
-	}
-
 	t := time.Now().Add(time.Duration(exp) * time.Second)
-	key.LifetimeSecs = exp
 	p.lifetime = key.LifetimeSecs
+
 	if exp > 0 {
 		p.expireTime = &t
 	}
 }
 
-func NewPrivKey(signer ssh.Signer, key agent.AddedKey, force bool, duration int) privKey {
+func NewPrivKey(signer ssh.Signer, key agent.AddedKey) privKey {
 	pub := signer.PublicKey()
 	pk := privKey{
 		signer:      signer,
@@ -63,7 +59,7 @@ func NewPrivKey(signer ssh.Signer, key agent.AddedKey, force bool, duration int)
 		pubKey:      pub,
 		fingerPrint: ssh.FingerprintSHA256(pub),
 	}
-	pk.setExpire(key, force, duration)
+	pk.setExpire(key)
 
 	return pk
 }