Merge pull request #118 from ST2Projects/tk/combine-seperate-projects

Tk/combine seperate projects

Author: neo1908

.github/workflows/go.yml

@@ -17,8 +17,12 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: 1.22
+
     - name: Test
       run: go test -v ./...
 
+    - name: Create output dir
+      run: mkdir -p "dist/bin"
+
     - name: Build
-      run: go build -v
+      run: go build -v -o dist/bin ./...

.github/workflows/release-package.yml

@@ -22,8 +22,10 @@ jobs:
           go-version: 1.22
       - name: Test
         run: go test -v ./...
+      - name: Create output dir
+        run: mkdir -p "dist/bin"
       - name: Build
-        run: go build -v
+        run: go build -v -o dist/bin ./...
       - name: Setup BuildX
         uses: docker/setup-buildx-action@v3
       - name: Login to registy ${{ env.REGISTRY }}

.goreleaser.yml

@@ -1,23 +1,50 @@
 env_files:
   github_token: .githubtoken
+
 before:
   hooks:
     - go mod tidy
+
 builds:
-  - goarch:
+  - id: ssh-sentinel-server
+    main: ./cmd/ssh-sentinel-server/main.go
+    binary: ssh-sentinel-server
+    goarch:
+      - amd64
+    goos:
+      - linux
+  - id: ssh-sentinel-client
+    main: ./cmd/ssh-sentinel-client/main.go
+    binary: ssh-sentinel-client
+    goarch:
       - amd64
     goos:
       - linux
 
 archives:
-  - files:
+  - id: ssh-sentinel-server
+    builds:
+      - ssh-sentinel-server
+    files:
       - samples
       - README.md
       - LICENSE
+    name_template: &name_template
+      '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
+  - id: ssh-sentinel-client
+    builds:
+      - ssh-sentinel-client
+    files:
+      - README.md
+      - LICENSE
+    name_template: *name_template
+
 checksum:
   name_template: 'checksums.txt'
+
 snapshot:
   name_template: "{{ .Tag }}-next"
+
 changelog:
   sort: asc
   filters:
@@ -33,4 +60,4 @@ signs:
     artifacts: checksum
 release:
   prerelease: auto
-  mode: keep-existing
+  mode: keep-existing

Dockerfile

@@ -3,7 +3,8 @@ FROM golang:1.22
 LABEL authors="st2projects"
 LABEL org.opencontainers.image.source=https://github.com/st2projects/ssh-sentinel-server
 
-COPY ssh-sentinel-server ./
+COPY dist/bin/ssh-sentinel-server ./
+COPY dist/bin/ssh-sentinel-client ./
 
 EXPOSE 8080
 RUN ["mkdir", "/resources"]

Makefile

@@ -0,0 +1,44 @@
+package clientcli
+
+import (
+	"encoding/json"
+	"github.com/st2projects/ssh-sentinel-server/model/api"
+	"os"
+)
+
+type ClientConfigType struct {
+	EndPoint   string          `json:"endPoint"`
+	APIKey     string          `json:"apiKey"`
+	Username   string          `json:"username"`
+	Principals []string        `json:"principals"`
+	Extensions []api.Extension `json:"extensions"`
+	PublicKey  string          `json:"publicKey"`
+	CertFile   string          `json:"certFile"`
+}
+
+var Config *ClientConfigType
+
+func MakeConfig(configFile string) {
+	if !PathExists(configFile) {
+		panic("config file " + configFile + " does not exits")
+	}
+
+	configString, err := os.ReadFile(configFile)
+	if err != nil {
+		panic(err)
+	}
+
+	err = json.Unmarshal(configString, &Config)
+	if err != nil {
+		panic(err)
+	}
+
+}
+
+func (c *ClientConfigType) GetPublicKey() string {
+	return ExpandPath(c.PublicKey)
+}
+
+func (c *ClientConfigType) GetCertFile() string {
+	return ExpandPath(c.CertFile)
+}

cli/client/clientConfigReader.go

@@ -0,0 +1,37 @@
+package clientcli
+
+import (
+	"encoding/json"
+	"github.com/spf13/cobra"
+	"os"
+	"path/filepath"
+)
+
+var initCmd = &cobra.Command{
+	Use:   "init",
+	Short: "Initialise the client",
+	Run: func(cmd *cobra.Command, args []string) {
+
+		configBytes, err := json.MarshalIndent(&ClientConfigType{}, "", "    ")
+
+		if err != nil {
+			panic(err)
+		}
+
+		userHome, err := os.UserHomeDir()
+
+		if err != nil {
+			panic(err)
+		}
+
+		configPath := filepath.Join(userHome, ".ssh-sentinel.json")
+		err = os.WriteFile(configPath, configBytes, os.FileMode(0600))
+		if err != nil {
+			panic(err)
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(initCmd)
+}

cli/client/init.go

@@ -0,0 +1,41 @@
+package clientcli
+
+import (
+	log "github.com/sirupsen/logrus"
+	"golang.org/x/crypto/ssh"
+	"os"
+	"time"
+)
+
+func IsCertValid(certPath string) (bool, string) {
+
+	certValid := PathExists(certPath)
+
+	if certValid {
+		certBytes, err := os.ReadFile(certPath)
+		if err != nil {
+			log.Errorf("%s - cert does not exist or cannot be read", certPath)
+		}
+
+		pub, _, _, _, err := ssh.ParseAuthorizedKey(certBytes)
+		if err != nil {
+			log.Errorf("Error when parsing cert: %s", err.Error())
+		}
+
+		cert, ok := pub.(*ssh.Certificate)
+
+		if !ok {
+			log.Errorf("Failed to cast to cert")
+		}
+
+		now := time.Now().UTC()
+		validBefore := time.Unix(int64(cert.ValidBefore), 0).UTC()
+		validAfter := time.Unix(int64(cert.ValidAfter), 0).UTC()
+
+		validBeforeString := validBefore.Format("2006-01-02 15:04:05.5 UTC")
+
+		return now.After(validAfter) && now.Before(validBefore), validBeforeString
+	}
+
+	return false, "Cert not found"
+}

cli/client/keyHelper.go

@@ -0,0 +1,28 @@
+package clientcli
+
+import (
+	"errors"
+	"os"
+	"os/user"
+	"path/filepath"
+	"strings"
+)
+
+func ExpandPath(path string) string {
+	usr, _ := user.Current()
+	homeDir := usr.HomeDir
+
+	if path == "~" {
+		path = homeDir
+	} else if strings.HasPrefix(path, "~/") {
+		path = filepath.Join(homeDir, path[2:])
+	}
+
+	return path
+}
+
+func PathExists(path string) bool {
+	_, err := os.Stat(path)
+
+	return !(err != nil && errors.Is(err, os.ErrNotExist))
+}

cli/client/pathHelper.go

@@ -0,0 +1,19 @@
+package clientcli
+
+import (
+	"github.com/spf13/cobra"
+	"os"
+)
+
+var rootCmd = &cobra.Command{
+	Use:   "ssh-sentinel-client <ARGS>",
+	Short: "A simple ssh-sentinel client",
+}
+
+func Execute() {
+	err := rootCmd.Execute()
+
+	if err != nil {
+		os.Exit(1)
+	}
+}