Restructure & add version command

This commit is contained in:
Bernd Schoolmann 2024-05-04 01:06:24 +02:00
parent 63ee486be0
commit 1696a53c15
No known key found for this signature in database
114 changed files with 308 additions and 202 deletions

View File

@ -1,5 +1,5 @@
pkgname=goldwarden pkgname=goldwarden
pkgver=0.2.16 pkgver=REPLACED_IN_CI_PIPELINE
pkgrel=1 pkgrel=1
pkgdesc='A feature-packed Bitwarden compatible desktop integration' pkgdesc='A feature-packed Bitwarden compatible desktop integration'
arch=('x86_64' 'aarch64') arch=('x86_64' 'aarch64')
@ -24,6 +24,8 @@ build() {
export GOFLAGS="-buildmode=pie -trimpath -modcacherw" export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
export CGO_ENABLED=1 export CGO_ENABLED=1
echo "$pkgver" > cmd/version.txt
go mod tidy go mod tidy
go build -o build/$pkgname . go build -o build/$pkgname .
} }

View File

@ -18,6 +18,8 @@ jobs:
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
- name: Install libfido2-dev - name: Install libfido2-dev
run: sudo apt-get install -y libfido2-dev run: sudo apt-get install -y libfido2-dev
- name: Build Debug - name: Build Debug
@ -35,6 +37,8 @@ jobs:
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
- name: Install libfido2-dev - name: Install libfido2-dev
run: sudo apt-get install -y libfido2-dev run: sudo apt-get install -y libfido2-dev
- name: Build - name: Build
@ -52,6 +56,8 @@ jobs:
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
- name: Install libfido2-dev - name: Install libfido2-dev
run: sudo apt-get install -y libfido2-dev run: sudo apt-get install -y libfido2-dev
- name: Build - name: Build
@ -69,6 +75,8 @@ jobs:
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
- name: Build - name: Build
run: GOARCH=386 go build -tags nofido2 -o goldwarden_linux_x86 -v . run: GOARCH=386 go build -tags nofido2 -o goldwarden_linux_x86 -v .
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
@ -85,6 +93,8 @@ jobs:
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
- name: Set up Homebrew - name: Set up Homebrew
id: set-up-homebrew id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master uses: Homebrew/actions/setup-homebrew@master
@ -106,6 +116,8 @@ jobs:
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
- name: Set up Homebrew - name: Set up Homebrew
id: set-up-homebrew id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master uses: Homebrew/actions/setup-homebrew@master
@ -127,6 +139,8 @@ jobs:
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
- uses: MinoruSekine/setup-scoop@v2 - uses: MinoruSekine/setup-scoop@v2
- name: Fido2 - name: Fido2
run: | run: |
@ -148,6 +162,8 @@ jobs:
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "$(git rev-parse --short HEAD)" > ./cmd/version.txt
- name: Build - name: Build
run: set GOARCH=arm64 && go build -tags nofido2 -o "goldwarden_windows_aarch64.exe" -v . run: set GOARCH=arm64 && go build -tags nofido2 -o "goldwarden_windows_aarch64.exe" -v .
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3

View File

@ -26,11 +26,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: ${{ env.GO_VERSION }} go-version: ${{ env.GO_VERSION }}
- name: Write version
run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
- name: Install libfido2-dev - name: Install libfido2-dev
run: sudo apt-get install -y libfido2-dev run: sudo apt-get install -y libfido2-dev
- name: Build - name: Build
@ -39,17 +40,6 @@ jobs:
with: with:
files: './goldwarden_linux_x86_64' files: './goldwarden_linux_x86_64'
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Publish AUR package
uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
with:
pkgname: goldwarden
updpkgsums: true
pkgbuild: ./PKGBUILD
commit_username: ${{ secrets.AUR_USERNAME }}
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
commit_message: Update AUR package from GitHub Actions automation
ssh_keyscan_types: ed25519
- name: Move binaries to directories - name: Move binaries to directories
run: | run: |
mkdir -p .debpkg/usr/bin mkdir -p .debpkg/usr/bin
@ -93,7 +83,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Write version
run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
@ -109,6 +100,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Write version
run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
@ -125,6 +118,8 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Write version
run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
@ -146,6 +141,8 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Write version
run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
@ -167,6 +164,8 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Write version
run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
@ -188,6 +187,8 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Write version
run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
@ -198,3 +199,24 @@ jobs:
with: with:
files: './goldwarden_windows_aarch64.exe' files: './goldwarden_windows_aarch64.exe'
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
publish_to_aur:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Write version
run: echo "${GITHUB_REF#refs/tags/}" > ./cmd/version.txt
- name: Replace version in PKGBUILD
run: sed -i "s/pkgver=.*/pkgver=${GITHUB_REF#refs\/tags\//}/" ./.github/workflows/PKGBUILD
- name: Publish AUR package
uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
with:
pkgname: goldwarden
updpkgsums: true
pkgbuild: ./.github/workflows/PKGBUILD
commit_username: ${{ secrets.AUR_USERNAME }}
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
commit_message: Update AUR package from GitHub Actions automation
ssh_keyscan_types: ed25519

View File

@ -31,8 +31,8 @@ There is a flatpak that includes a small UI, autotype functionality and autostar
[<img width='240' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png' />](https://flathub.org/apps/details/com.quexten.Goldwarden) [<img width='240' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png' />](https://flathub.org/apps/details/com.quexten.Goldwarden)
<img src='https://github.com/quexten/goldwarden/assets/11866552/fd302636-3494-4f92-a51d-50ac863885f2' width='400'> <img src='https://github.com/quexten/goldwarden/cli/assets/11866552/fd302636-3494-4f92-a51d-50ac863885f2' width='400'>
<img src='https://github.com/quexten/goldwarden/assets/11866552/683f0ed4-e4cb-4088-9fb0-d08fcec3fa22' width='400'> <img src='https://github.com/quexten/goldwarden/cli/assets/11866552/683f0ed4-e4cb-4088-9fb0-d08fcec3fa22' width='400'>
#### CLI #### CLI
##### Arch (AUR) ##### Arch (AUR)
@ -61,12 +61,12 @@ go install github.com/quexten/goldwarden@latest
``` ```
### Setup and Usage ### Setup and Usage
To get started, follow the instructions provided in the wiki https://github.com/quexten/goldwarden/wiki/Getting-Started. To get started, follow the instructions provided in the wiki https://github.com/quexten/goldwarden/cli/wiki/Getting-Started.
For instructions on specific features, also consult the wiki page for the feature. For instructions on specific features, also consult the wiki page for the feature.
### Contributing ### Contributing
Interested in contributing a feature or bug-fix? Great! Here is some information on how to set up your development environment: Interested in contributing a feature or bug-fix? Great! Here is some information on how to set up your development environment:
https://github.com/quexten/goldwarden/wiki/Setting-up-the-Development-Environment https://github.com/quexten/goldwarden/cli/wiki/Setting-up-the-Development-Environment
After that, create a PR. If you encounter any issues, feel free to open a discussion thread. After that, create a PR. If you encounter any issues, feel free to open a discussion thread.

View File

@ -3,14 +3,14 @@ package actions
import ( import (
"context" "context"
"github.com/quexten/goldwarden/agent/bitwarden" "github.com/quexten/goldwarden/cli/agent/bitwarden"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/systemauth" "github.com/quexten/goldwarden/cli/agent/systemauth"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var actionsLog = logging.GetLogger("Goldwarden", "Actions") var actionsLog = logging.GetLogger("Goldwarden", "Actions")

View File

@ -6,14 +6,14 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/notify" "github.com/quexten/goldwarden/cli/agent/notify"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/systemauth/biometrics" "github.com/quexten/goldwarden/cli/agent/systemauth/biometrics"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func handleGetBiometricsKey(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) { func handleGetBiometricsKey(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) {

View File

@ -5,10 +5,10 @@ import (
"io" "io"
"net/http" "net/http"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func handleSetApiURL(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) { func handleSetApiURL(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) {

View File

@ -3,12 +3,12 @@ package actions
import ( import (
"fmt" "fmt"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/systemauth" "github.com/quexten/goldwarden/cli/agent/systemauth"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func handleGetCliCredentials(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) { func handleGetCliCredentials(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) {

View File

@ -5,13 +5,13 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/quexten/goldwarden/agent/bitwarden" "github.com/quexten/goldwarden/cli/agent/bitwarden"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/notify" "github.com/quexten/goldwarden/cli/agent/notify"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func handleLogin(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) { func handleLogin(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) {

View File

@ -4,13 +4,13 @@ import (
"fmt" "fmt"
"runtime/debug" "runtime/debug"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/systemauth" "github.com/quexten/goldwarden/cli/agent/systemauth"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func handleGetLoginCipher(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) { func handleGetLoginCipher(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, ctx *sockets.CallingContext) (response messages.IPCMessage, err error) {

View File

@ -4,11 +4,11 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/quexten/goldwarden/agent/bitwarden" "github.com/quexten/goldwarden/cli/agent/bitwarden"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func handleCreateSend(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) { func handleCreateSend(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) {

View File

@ -4,13 +4,13 @@ import (
"context" "context"
"strings" "strings"
"github.com/quexten/goldwarden/agent/bitwarden" "github.com/quexten/goldwarden/cli/agent/bitwarden"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/ssh" "github.com/quexten/goldwarden/cli/agent/ssh"
"github.com/quexten/goldwarden/agent/systemauth" "github.com/quexten/goldwarden/cli/agent/systemauth"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func handleAddSSH(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) { func handleAddSSH(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) {

View File

@ -3,15 +3,15 @@ package actions
import ( import (
"context" "context"
"github.com/quexten/goldwarden/agent/bitwarden" "github.com/quexten/goldwarden/cli/agent/bitwarden"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/systemauth/biometrics" "github.com/quexten/goldwarden/cli/agent/systemauth/biometrics"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func handleUnlockVault(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) { func handleUnlockVault(request messages.IPCMessage, cfg *config.Config, vault *vault.Vault, callingContext *sockets.CallingContext) (response messages.IPCMessage, err error) {

View File

@ -14,13 +14,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/bitwarden/twofactor" "github.com/quexten/goldwarden/cli/agent/bitwarden/twofactor"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/notify" "github.com/quexten/goldwarden/cli/agent/notify"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
) )

View File

@ -3,8 +3,8 @@ package bitwarden
import ( import (
"context" "context"
"github.com/quexten/goldwarden/agent/bitwarden/models" "github.com/quexten/goldwarden/cli/agent/bitwarden/models"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
) )
func PostCipher(ctx context.Context, cipher models.Cipher, cfg *config.Config) (models.Cipher, error) { func PostCipher(ctx context.Context, cipher models.Cipher, cfg *config.Config) (models.Cipher, error) {

View File

@ -13,7 +13,7 @@ import (
"strconv" "strconv"
"github.com/awnumar/memguard" "github.com/awnumar/memguard"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var cryptoLog = logging.GetLogger("Goldwarden", "Crypto") var cryptoLog = logging.GetLogger("Goldwarden", "Crypto")

View File

@ -3,7 +3,7 @@ package crypto
import ( import (
"errors" "errors"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var keyringLog = logging.GetLogger("Goldwarden", "Keyring") var keyringLog = logging.GetLogger("Goldwarden", "Keyring")

View File

@ -4,7 +4,7 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
) )
type SyncData struct { type SyncData struct {

View File

@ -5,8 +5,8 @@ import (
"encoding/base64" "encoding/base64"
"time" "time"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
) )
type CreateAuthRequestData struct { type CreateAuthRequestData struct {

View File

@ -9,9 +9,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"golang.org/x/crypto/hkdf" "golang.org/x/crypto/hkdf"
) )

View File

@ -7,11 +7,11 @@ import (
"os" "os"
"time" "time"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/bitwarden/models" "github.com/quexten/goldwarden/cli/agent/bitwarden/models"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var log = logging.GetLogger("Goldwarden", "Bitwarden API") var log = logging.GetLogger("Goldwarden", "Bitwarden API")

View File

@ -10,8 +10,8 @@ import (
"net/url" "net/url"
"github.com/keys-pub/go-libfido2" "github.com/keys-pub/go-libfido2"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
) )
const isFido2Enabled = true const isFido2Enabled = true

View File

@ -4,7 +4,8 @@ package twofactor
import ( import (
"errors" "errors"
"github.com/quexten/goldwarden/agent/config"
"github.com/quexten/goldwarden/cli/agent/config"
) )
const isFido2Enabled = false const isFido2Enabled = false

View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var twofactorLog = logging.GetLogger("Goldwarden", "TwoFactor") var twofactorLog = logging.GetLogger("Goldwarden", "TwoFactor")

View File

@ -9,13 +9,13 @@ import (
"github.com/awnumar/memguard" "github.com/awnumar/memguard"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/quexten/goldwarden/agent/bitwarden/models" "github.com/quexten/goldwarden/cli/agent/bitwarden/models"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/notify" "github.com/quexten/goldwarden/cli/agent/notify"
"github.com/quexten/goldwarden/agent/systemauth/biometrics" "github.com/quexten/goldwarden/cli/agent/systemauth/biometrics"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
"github.com/vmihailenco/msgpack/v5" "github.com/vmihailenco/msgpack/v5"
) )

View File

@ -15,12 +15,12 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/notify" "github.com/quexten/goldwarden/cli/agent/notify"
"github.com/quexten/goldwarden/agent/pincache" "github.com/quexten/goldwarden/cli/agent/pincache"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
"github.com/tink-crypto/tink-go/v2/aead/subtle" "github.com/tink-crypto/tink-go/v2/aead/subtle"
"golang.org/x/crypto/argon2" "golang.org/x/crypto/argon2"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"

View File

@ -5,7 +5,7 @@ package notify
import ( import (
"time" "time"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var notificationID uint32 = 1000000 var notificationID uint32 = 1000000

View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"github.com/awnumar/memguard" "github.com/awnumar/memguard"
"github.com/quexten/goldwarden/agent/systemauth/biometrics" "github.com/quexten/goldwarden/cli/agent/systemauth/biometrics"
) )
var cachedPin *memguard.Enclave var cachedPin *memguard.Enclave

View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5"
"github.com/quexten/goldwarden/agent/processsecurity/isdelve" "github.com/quexten/goldwarden/cli/agent/processsecurity/isdelve"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

View File

@ -7,8 +7,8 @@ import (
"io" "io"
"github.com/mikesmitty/edkey" "github.com/mikesmitty/edkey"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/bitwarden/models" "github.com/quexten/goldwarden/cli/agent/bitwarden/models"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )

View File

@ -7,13 +7,13 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/notify" "github.com/quexten/goldwarden/cli/agent/notify"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/systemauth" "github.com/quexten/goldwarden/cli/agent/systemauth"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/agent" "golang.org/x/crypto/ssh/agent"
) )

View File

@ -6,7 +6,7 @@ import (
"net" "net"
"os" "os"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"golang.org/x/crypto/ssh/agent" "golang.org/x/crypto/ssh/agent"
) )

View File

@ -4,7 +4,7 @@ package ssh
import ( import (
"github.com/Microsoft/go-winio" "github.com/Microsoft/go-winio"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"golang.org/x/crypto/ssh/agent" "golang.org/x/crypto/ssh/agent"
) )

View File

@ -1,7 +1,7 @@
package biometrics package biometrics
import ( import (
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var log = logging.GetLogger("Goldwarden", "Biometrics") var log = logging.GetLogger("Goldwarden", "Biometrics")

View File

@ -7,7 +7,7 @@ import (
"github.com/keybase/client/go/logger" "github.com/keybase/client/go/logger"
"github.com/keybase/client/go/protocol/keybase1" "github.com/keybase/client/go/protocol/keybase1"
pinentry "github.com/quexten/goldwarden/agent/systemauth/pinentry/keybase-pinentry" pinentry "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry/keybase-pinentry"
) )
func getPassword(title string, description string) (string, error) { func getPassword(title string, description string) (string, error) {

View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"os" "os"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var log = logging.GetLogger("Goldwarden", "Pinentry") var log = logging.GetLogger("Goldwarden", "Pinentry")

View File

@ -5,11 +5,11 @@ import (
"math" "math"
"time" "time"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/systemauth/biometrics" "github.com/quexten/goldwarden/cli/agent/systemauth/biometrics"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var log = logging.GetLogger("Goldwarden", "Systemauth") var log = logging.GetLogger("Goldwarden", "Systemauth")

View File

@ -9,19 +9,19 @@ import (
"os" "os"
"time" "time"
"github.com/quexten/goldwarden/agent/actions" "github.com/quexten/goldwarden/cli/agent/actions"
"github.com/quexten/goldwarden/agent/bitwarden" "github.com/quexten/goldwarden/cli/agent/bitwarden"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/agent/notify" "github.com/quexten/goldwarden/cli/agent/notify"
"github.com/quexten/goldwarden/agent/processsecurity" "github.com/quexten/goldwarden/cli/agent/processsecurity"
"github.com/quexten/goldwarden/agent/sockets" "github.com/quexten/goldwarden/cli/agent/sockets"
"github.com/quexten/goldwarden/agent/ssh" "github.com/quexten/goldwarden/cli/agent/ssh"
"github.com/quexten/goldwarden/agent/systemauth" "github.com/quexten/goldwarden/cli/agent/systemauth"
"github.com/quexten/goldwarden/agent/systemauth/pinentry" "github.com/quexten/goldwarden/cli/agent/systemauth/pinentry"
"github.com/quexten/goldwarden/agent/vault" "github.com/quexten/goldwarden/cli/agent/vault"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
const ( const (

View File

@ -5,9 +5,9 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/quexten/goldwarden/agent/bitwarden/crypto" "github.com/quexten/goldwarden/cli/agent/bitwarden/crypto"
"github.com/quexten/goldwarden/agent/bitwarden/models" "github.com/quexten/goldwarden/cli/agent/bitwarden/models"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
) )

View File

@ -9,7 +9,7 @@ import (
"time" "time"
"github.com/godbus/dbus/v5" "github.com/godbus/dbus/v5"
"github.com/quexten/goldwarden/logging" "github.com/quexten/goldwarden/cli/logging"
) )
var globalID = 0 var globalID = 0

View File

@ -8,7 +8,7 @@ import (
"os" "os"
"unsafe" "unsafe"
"github.com/quexten/goldwarden/browserbiometrics/logging" "github.com/quexten/goldwarden/cli/browserbiometrics/logging"
) )
const bufferSize = 8192 * 8 const bufferSize = 8192 * 8

View File

@ -7,8 +7,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/browserbiometrics/logging" "github.com/quexten/goldwarden/cli/browserbiometrics/logging"
) )
//go:embed mozilla-com.8bit.bitwarden.json //go:embed mozilla-com.8bit.bitwarden.json

View File

@ -7,10 +7,10 @@ import (
"io" "io"
"os" "os"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/browserbiometrics/logging" "github.com/quexten/goldwarden/cli/browserbiometrics/logging"
"github.com/quexten/goldwarden/client" "github.com/quexten/goldwarden/cli/client"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
var runtimeConfig *config.RuntimeConfig var runtimeConfig *config.RuntimeConfig

View File

@ -5,8 +5,8 @@ package setup
import ( import (
"fmt" "fmt"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/cmd" "github.com/quexten/goldwarden/cli/cmd"
) )
func VerifySetup(runtimeConfig config.RuntimeConfig) bool { func VerifySetup(runtimeConfig config.RuntimeConfig) bool {

View File

@ -2,7 +2,7 @@
package setup package setup
import "github.com/quexten/goldwarden/agent/config" import "github.com/quexten/goldwarden/cli/agent/config"
func VerifySetup(runtimeConfig config.RuntimeConfig) bool { func VerifySetup(runtimeConfig config.RuntimeConfig) bool {
return true return true

View File

@ -6,8 +6,8 @@ import (
"net" "net"
"os" "os"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
const READ_BUFFER = 4 * 1024 * 1024 // 16MB const READ_BUFFER = 4 * 1024 * 1024 // 16MB

View File

@ -7,7 +7,7 @@ import (
"encoding/hex" "encoding/hex"
"os" "os"
"github.com/quexten/goldwarden/autotype" "github.com/quexten/goldwarden/cli/autotype"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -6,7 +6,7 @@ import (
"syscall" "syscall"
"github.com/awnumar/memguard" "github.com/awnumar/memguard"
"github.com/quexten/goldwarden/agent" "github.com/quexten/goldwarden/cli/agent"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -6,7 +6,7 @@ package cmd
import ( import (
"fmt" "fmt"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -8,8 +8,8 @@ import (
"strings" "strings"
"github.com/icza/gox/stringsx" "github.com/icza/gox/stringsx"
"github.com/quexten/goldwarden/client" "github.com/quexten/goldwarden/cli/client"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -3,7 +3,7 @@ package cmd
import ( import (
"fmt" "fmt"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/quexten/goldwarden/agent/config" "github.com/quexten/goldwarden/cli/agent/config"
"github.com/quexten/goldwarden/client" "github.com/quexten/goldwarden/cli/client"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -8,7 +8,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -6,7 +6,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -11,8 +11,8 @@ import (
"os/user" "os/user"
"strings" "strings"
"github.com/quexten/goldwarden/agent/systemauth/biometrics" "github.com/quexten/goldwarden/cli/agent/systemauth/biometrics"
"github.com/quexten/goldwarden/browserbiometrics" "github.com/quexten/goldwarden/cli/browserbiometrics"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -5,7 +5,7 @@ import (
"os" "os"
"github.com/atotto/clipboard" "github.com/atotto/clipboard"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

25
cli/cmd/version.go Normal file
View File

@ -0,0 +1,25 @@
package cmd
import (
"fmt"
_ "embed"
"github.com/spf13/cobra"
)
//go:embed version.txt
var version string
var versionCmd = &cobra.Command{
Use: "version",
Short: "Shows the version of the cli",
Long: `Shows the version of the cli`,
Run: func(cmd *cobra.Command, args []string) {
fmt.Println(version)
},
}
func init() {
rootCmd.AddCommand(versionCmd)
}

1
cli/cmd/version.txt Normal file
View File

@ -0,0 +1 @@
dev

View File

@ -1,7 +1,7 @@
package ipc package ipc
import ( import (
"github.com/quexten/goldwarden/ipc/messages" "github.com/quexten/goldwarden/cli/ipc/messages"
) )
func ParsedPayload(m messages.IPCMessage) interface{} { func ParsedPayload(m messages.IPCMessage) interface{} {

Some files were not shown because too many files have changed in this diff Show More