Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go-ssh-keysign/internal/config/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"

"binarycodes/ssh-keysign/internal/apperror"
"binarycodes/ssh-keysign/internal/service/utilities"
"binarycodes/ssh-keysign/internal/service/paths"
)

type OAuth struct {
Expand Down Expand Up @@ -157,7 +157,7 @@ func ValidateKeyFile(keyfilePath string, opt bool) error {
return nil
}

expandedKeyFilePath, err := utilities.NormalizePath(keyfilePath)
expandedKeyFilePath, err := paths.NormalizePath(keyfilePath)
if err != nil {
return apperror.ErrFileSystem(err)
}
Expand Down
2 changes: 1 addition & 1 deletion go-ssh-keysign/internal/service/cacert/cacerthandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (CACertHandler) StoreUserCertAgent(ctx context.Context, u *service.UserCert
now := uint64(time.Now().Unix())
if cert.ValidBefore != ssh.CertTimeInfinity && cert.ValidBefore > now {
certDuration := uint64(time.Duration(cert.ValidBefore-now) * time.Second)
lifetime = min(lifetime, certDuration)
lifetime = certDuration
}

add := agent.AddedKey{
Expand Down
4 changes: 2 additions & 2 deletions go-ssh-keysign/internal/service/keys/keyshandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
"golang.org/x/crypto/ssh"

"binarycodes/ssh-keysign/internal/service"
"binarycodes/ssh-keysign/internal/service/utilities"
"binarycodes/ssh-keysign/internal/service/paths"
)

type CAKeyHandler struct{}

func (c CAKeyHandler) ReadPublicKey(ctx context.Context, path string) (keyType, pubKey string, err error) {
p, err := utilities.NormalizePath(path)
p, err := paths.NormalizePath(path)
if err != nil {
return "", "", err
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package utilities
package paths

import (
"fmt"
Expand Down
4 changes: 2 additions & 2 deletions go-ssh-keysign/internal/service/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"binarycodes/ssh-keysign/internal/config"
"binarycodes/ssh-keysign/internal/ctxkeys"
"binarycodes/ssh-keysign/internal/logging"
"binarycodes/ssh-keysign/internal/service/utilities"
"binarycodes/ssh-keysign/internal/service/paths"
)

type KeyHandler interface {
Expand Down Expand Up @@ -128,7 +128,7 @@ func (k Keys) FetchPublicKey() string {

func (k Keys) FetchCertFileName() (string, error) {
if k.Filename != "" {
return utilities.GetCertificateFilePath(k.Filename)
return paths.GetCertificateFilePath(k.Filename)
}

return "", nil
Expand Down
2 changes: 1 addition & 1 deletion nfpm.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ssh-keysign
arch: amd64
platform: linux
version: 0.0.8
version: 0.0.9
section: default
priority: extra
maintainer: Sujoy Das <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion retry-tag-workflow.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

tagname="v0.0.8"
tagname="v0.0.9"

git tag -d "$tagname"
git push --delete origin "$tagname"
Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>io.binarycodes.homelab</groupId>
<artifactId>ssh-signer-mono</artifactId>
<name>SSH KeySigner</name>
<version>0.0.8</version>
<version>0.0.9</version>

<packaging>pom</packaging>

Expand Down
4 changes: 2 additions & 2 deletions server/ssh-key-signer-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>io.binarycodes.homelab</groupId>
<artifactId>ssh-key-signer-server</artifactId>
<version>0.0.8</version>
<version>0.0.9</version>
<packaging>jar</packaging>

<name>Server - SSH Key Signer</name>
Expand All @@ -14,7 +14,7 @@
<properties>
<java.version>21</java.version>
<vaadin.version>24.9.2</vaadin.version>
<ssh-signer-common-lib.version>0.0.8</ssh-signer-common-lib.version>
<ssh-signer-common-lib.version>0.0.9</ssh-signer-common-lib.version>
</properties>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion server/ssh-signer-common-lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.binarycodes.homelab</groupId>
<artifactId>ssh-signer-common-lib</artifactId>
<version>0.0.8</version>
<version>0.0.9</version>

<name>Common Library - SSH Key Signer</name>

Expand Down
3 changes: 3 additions & 0 deletions update_app_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ popd
sed -i "s/tagname=\"v[0-9]\+\.[0-9]\+\.[0-9]\+\"/tagname=\"v$version\"/g" retry-tag-workflow.sh
git add retry-tag-workflow.sh

sed -i "s/version: [0-9]\+\.[0-9]\+\.[0-9]\+/version: $version/g" nfpm.yaml
git add nfpm.yaml

git commit -S -m "update version to $version"
git push --set-upstream origin ${branch_name}

Expand Down
Loading