From fe921b879075bcf2afed3e44069b8ca41321c646 Mon Sep 17 00:00:00 2001 From: Joe Julian Date: Thu, 9 Apr 2026 06:42:21 -0700 Subject: [PATCH] Move app packages under internal --- APK.md | 2 +- Makefile | 2 +- README.md | 2 +- buildapk/config.go | 2 +- {api => internal/api}/host.go | 26 ++-- {api => internal/api}/host_test.go | 6 +- {api => internal/api}/server.go | 16 +-- {api => internal/api}/server_test.go | 122 +++++++++--------- .../apiapproval}/approval.go | 24 ++-- .../apiapproval}/approval_test.go | 2 +- {apiaudit => internal/apiaudit}/audit.go | 2 +- {apiaudit => internal/apiaudit}/audit_test.go | 2 +- {apitokens => internal/apitokens}/tokens.go | 2 +- .../apitokens}/tokens_test.go | 2 +- .../appstate}/remote_binding.go | 2 +- .../appstate}/remote_binding_test.go | 2 +- {appstate => internal/appstate}/state.go | 8 +- {appstate => internal/appstate}/state_test.go | 10 +- internal/appui/app.go | 24 ++-- internal/appui/clipboard_gio.go | 2 +- internal/appui/main_test.go | 18 +-- internal/appui/ui_api.go | 4 +- internal/appui/ui_editor.go | 6 +- internal/appui/ui_forms.go | 2 +- internal/appui/ui_keyboard.go | 2 +- internal/appui/ui_preferences.go | 2 +- internal/appui/ui_shortcuts.go | 2 +- internal/appui/ui_sync_menu_model.go | 2 +- {assets => internal/assets}/assets.go | 0 .../assets}/keepassgo-icon.png | Bin .../assets}/keepassgo-icon.svg | 0 .../assets}/keepassgo-logo-horizontal.png | Bin .../assets}/keepassgo-logo-horizontal.svg | 0 .../assets}/keepassgo-splash-light.svg | 0 .../assets}/keepassgo-splash-square.png | Bin .../assets}/keepassgo-splash-square.svg | 0 .../autofillcache}/cache.go | 2 +- .../autofillcache}/cache_test.go | 2 +- {clipboard => internal/clipboard}/service.go | 2 +- .../clipboard}/service_test.go | 2 +- .../passwords}/generator.go | 0 .../passwords}/generator_test.go | 0 {session => internal/session}/session.go | 4 +- {session => internal/session}/session_test.go | 4 +- {vault => internal/vault}/history_test.go | 0 {vault => internal/vault}/kdbx.go | 0 {vault => internal/vault}/kdbx_test.go | 0 {vault => internal/vault}/masterkey.go | 0 {vault => internal/vault}/model.go | 0 {vault => internal/vault}/model_test.go | 0 {vault => internal/vault}/security.go | 6 +- {vault => internal/vault}/security_test.go | 0 {webdav => internal/webdav}/client.go | 0 {webdav => internal/webdav}/client_test.go | 0 .../archlinux/keepassgo-git/PKGBUILD.tmpl | 4 +- 55 files changed, 162 insertions(+), 162 deletions(-) rename {api => internal/api}/host.go (83%) rename {api => internal/api}/host_test.go (93%) rename {api => internal/api}/server.go (98%) rename {api => internal/api}/server_test.go (92%) rename {apiapproval => internal/apiapproval}/approval.go (90%) rename {apiapproval => internal/apiapproval}/approval_test.go (98%) rename {apiaudit => internal/apiaudit}/audit.go (96%) rename {apiaudit => internal/apiaudit}/audit_test.go (97%) rename {apitokens => internal/apitokens}/tokens.go (99%) rename {apitokens => internal/apitokens}/tokens_test.go (99%) rename {appstate => internal/appstate}/remote_binding.go (98%) rename {appstate => internal/appstate}/remote_binding_test.go (99%) rename {appstate => internal/appstate}/state.go (99%) rename {appstate => internal/appstate}/state_test.go (99%) rename {assets => internal/assets}/assets.go (100%) rename {assets => internal/assets}/keepassgo-icon.png (100%) rename {assets => internal/assets}/keepassgo-icon.svg (100%) rename {assets => internal/assets}/keepassgo-logo-horizontal.png (100%) rename {assets => internal/assets}/keepassgo-logo-horizontal.svg (100%) rename {assets => internal/assets}/keepassgo-splash-light.svg (100%) rename {assets => internal/assets}/keepassgo-splash-square.png (100%) rename {assets => internal/assets}/keepassgo-splash-square.svg (100%) rename {autofillcache => internal/autofillcache}/cache.go (99%) rename {autofillcache => internal/autofillcache}/cache_test.go (99%) rename {clipboard => internal/clipboard}/service.go (97%) rename {clipboard => internal/clipboard}/service_test.go (98%) rename {passwords => internal/passwords}/generator.go (100%) rename {passwords => internal/passwords}/generator_test.go (100%) rename {session => internal/session}/session.go (99%) rename {session => internal/session}/session_test.go (99%) rename {vault => internal/vault}/history_test.go (100%) rename {vault => internal/vault}/kdbx.go (100%) rename {vault => internal/vault}/kdbx_test.go (100%) rename {vault => internal/vault}/masterkey.go (100%) rename {vault => internal/vault}/model.go (100%) rename {vault => internal/vault}/model_test.go (100%) rename {vault => internal/vault}/security.go (97%) rename {vault => internal/vault}/security_test.go (100%) rename {webdav => internal/webdav}/client.go (100%) rename {webdav => internal/webdav}/client_test.go (100%) diff --git a/APK.md b/APK.md index 6cb6606..3f7e7d9 100644 --- a/APK.md +++ b/APK.md @@ -34,7 +34,7 @@ go tool gogio -target android ./cmd/keepassgo ... The Android build uses the branded icon asset at: -- `assets/keepassgo-icon.png` +- `internal/assets/keepassgo-icon.png` Note: diff --git a/Makefile b/Makefile index 599a156..0e8fed1 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ apk: android/keepassgo-android.jar -version $(APK_VERSION) \ -minsdk $(ANDROID_MIN_SDK) \ -targetsdk $(ANDROID_TARGET_SDK) \ - -icon assets/keepassgo-icon.png \ + -icon internal/assets/keepassgo-icon.png \ ./cmd/keepassgo android/keepassgo-android.jar: $(shell find androidsrc -type f | sort) diff --git a/README.md b/README.md index 29f4929..8118850 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ go get -tool gioui.org/cmd/gogio@latest Package: ```bash -go tool gogio -target android -icon assets/keepassgo-icon.png ./cmd/keepassgo +go tool gogio -target android -icon internal/assets/keepassgo-icon.png ./cmd/keepassgo ``` You will need the Android SDK and NDK installed and configured for real device or release packaging. diff --git a/buildapk/config.go b/buildapk/config.go index 35e53b3..66541e2 100644 --- a/buildapk/config.go +++ b/buildapk/config.go @@ -16,7 +16,7 @@ const ( DefaultLdflags = "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=dev" DefaultMinSDK = "28" DefaultTargetSDK = "35" - DefaultIconPath = "assets/keepassgo-icon.png" + DefaultIconPath = "internal/assets/keepassgo-icon.png" ) type Config struct { diff --git a/api/host.go b/internal/api/host.go similarity index 83% rename from api/host.go rename to internal/api/host.go index c0e67f1..3dadb64 100644 --- a/api/host.go +++ b/internal/api/host.go @@ -7,26 +7,26 @@ import ( "strings" "sync" - "git.julianfamily.org/keepassgo/clipboard" - "git.julianfamily.org/keepassgo/passwords" + "git.julianfamily.org/keepassgo/internal/clipboard" + "git.julianfamily.org/keepassgo/internal/passwords" + "git.julianfamily.org/keepassgo/internal/session" + "git.julianfamily.org/keepassgo/internal/vault" keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1" - "git.julianfamily.org/keepassgo/session" - "git.julianfamily.org/keepassgo/vault" "google.golang.org/grpc" ) type DirtyProvider func() bool type Host struct { - server *Server - grpcServer *grpc.Server - listener net.Listener - lifecycle lifecycleBackend - dirty DirtyProvider - mu sync.Mutex - lastModel vault.Model - started bool - listenAddr string + server *Server + grpcServer *grpc.Server + listener net.Listener + lifecycle lifecycleBackend + dirty DirtyProvider + mu sync.Mutex + lastModel vault.Model + started bool + listenAddr string } func StartHost(addr string, lifecycle lifecycleBackend, profiles map[string]passwords.Profile, clipboardWriter clipboard.Writer, dirty DirtyProvider) (*Host, error) { diff --git a/api/host_test.go b/internal/api/host_test.go similarity index 93% rename from api/host_test.go rename to internal/api/host_test.go index 0ab10c1..8de2477 100644 --- a/api/host_test.go +++ b/internal/api/host_test.go @@ -5,10 +5,10 @@ import ( "net" "testing" - "git.julianfamily.org/keepassgo/passwords" + "git.julianfamily.org/keepassgo/internal/passwords" + "git.julianfamily.org/keepassgo/internal/session" + "git.julianfamily.org/keepassgo/internal/vault" keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1" - "git.julianfamily.org/keepassgo/session" - "git.julianfamily.org/keepassgo/vault" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/api/server.go b/internal/api/server.go similarity index 98% rename from api/server.go rename to internal/api/server.go index 22be4e6..7daa9d6 100644 --- a/api/server.go +++ b/internal/api/server.go @@ -10,15 +10,15 @@ import ( "sync" "time" - "git.julianfamily.org/keepassgo/apiaudit" - "git.julianfamily.org/keepassgo/apiapproval" - "git.julianfamily.org/keepassgo/apitokens" - "git.julianfamily.org/keepassgo/clipboard" - "git.julianfamily.org/keepassgo/passwords" + "git.julianfamily.org/keepassgo/internal/apiapproval" + "git.julianfamily.org/keepassgo/internal/apiaudit" + "git.julianfamily.org/keepassgo/internal/apitokens" + "git.julianfamily.org/keepassgo/internal/clipboard" + "git.julianfamily.org/keepassgo/internal/passwords" + "git.julianfamily.org/keepassgo/internal/session" + "git.julianfamily.org/keepassgo/internal/vault" + "git.julianfamily.org/keepassgo/internal/webdav" keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1" - "git.julianfamily.org/keepassgo/session" - "git.julianfamily.org/keepassgo/vault" - "git.julianfamily.org/keepassgo/webdav" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/api/server_test.go b/internal/api/server_test.go similarity index 92% rename from api/server_test.go rename to internal/api/server_test.go index 3a4d86e..0dcf686 100644 --- a/api/server_test.go +++ b/internal/api/server_test.go @@ -10,14 +10,14 @@ import ( "testing" "time" - "git.julianfamily.org/keepassgo/apiaudit" - "git.julianfamily.org/keepassgo/apiapproval" - "git.julianfamily.org/keepassgo/apitokens" - "git.julianfamily.org/keepassgo/passwords" + "git.julianfamily.org/keepassgo/internal/apiapproval" + "git.julianfamily.org/keepassgo/internal/apiaudit" + "git.julianfamily.org/keepassgo/internal/apitokens" + "git.julianfamily.org/keepassgo/internal/passwords" + "git.julianfamily.org/keepassgo/internal/session" + "git.julianfamily.org/keepassgo/internal/vault" + "git.julianfamily.org/keepassgo/internal/webdav" keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1" - "git.julianfamily.org/keepassgo/session" - "git.julianfamily.org/keepassgo/vault" - "git.julianfamily.org/keepassgo/webdav" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" @@ -1053,64 +1053,64 @@ func testAPITokenEntry(t *testing.T, rules ...apitokens.PolicyRule) vault.Entry func newTestClient(t *testing.T) (keepassgov1.VaultServiceClient, *memoryClipboardWriter, func()) { t.Helper() model := vault.Model{ - Entries: []vault.Entry{ - { - ID: "vault-console", - Title: "Vault Console", - Username: "dannyocean", - Password: "token-1", - URL: "https://vault.crew.example.invalid", - Fields: map[string]string{ - "X-Role": "automation", - }, - History: []vault.Entry{ - { - ID: "vault-console-h1", - Title: "Vault Console", - Username: "dannyocean", - Password: "token-0", - URL: "https://vault.crew.example.invalid", - Path: []string{"Root", "Internet"}, - }, - }, - Path: []string{"Root", "Internet"}, + Entries: []vault.Entry{ + { + ID: "vault-console", + Title: "Vault Console", + Username: "dannyocean", + Password: "token-1", + URL: "https://vault.crew.example.invalid", + Fields: map[string]string{ + "X-Role": "automation", }, - { - ID: "surveillance-console", - Title: "Surveillance Console", - Username: "codex", - Password: "token-2", - URL: "https://surveillance.crew.example.invalid", - Path: []string{"Root", "Home Assistant"}, + History: []vault.Entry{ + { + ID: "vault-console-h1", + Title: "Vault Console", + Username: "dannyocean", + Password: "token-0", + URL: "https://vault.crew.example.invalid", + Path: []string{"Root", "Internet"}, + }, }, - testAPITokenEntry(t, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationManageVault, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationListEntries, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationListGroups, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationMutateGroup, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationMutateEntry, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationReadEntry, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationCopyPassword, Resource: apitokens.Resource{Kind: apitokens.ResourceEntry, EntryID: "vault-console", Path: []string{"Root", "Internet"}}}, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationCopyUsername, Resource: apitokens.Resource{Kind: apitokens.ResourceEntry, EntryID: "vault-console", Path: []string{"Root", "Internet"}}}, - apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationCopyURL, Resource: apitokens.Resource{Kind: apitokens.ResourceEntry, EntryID: "vault-console", Path: []string{"Root", "Internet"}}}, - ), + Path: []string{"Root", "Internet"}, }, - Templates: []vault.Entry{ - { - ID: "website-login", - Title: "Website Login", - Username: "template-user", - Password: "template-password", - URL: "https://example.com", - Notes: "Reusable template for website accounts.", - Fields: map[string]string{ - "Environment": "prod", - }, - Tags: []string{"template", "web"}, - Path: []string{"Templates"}, - }, + { + ID: "surveillance-console", + Title: "Surveillance Console", + Username: "codex", + Password: "token-2", + URL: "https://surveillance.crew.example.invalid", + Path: []string{"Root", "Home Assistant"}, }, - } + testAPITokenEntry(t, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationManageVault, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationListEntries, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationListGroups, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationMutateGroup, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationMutateEntry, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationReadEntry, Resource: apitokens.Resource{Kind: apitokens.ResourceGroup, Path: []string{"Root"}}}, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationCopyPassword, Resource: apitokens.Resource{Kind: apitokens.ResourceEntry, EntryID: "vault-console", Path: []string{"Root", "Internet"}}}, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationCopyUsername, Resource: apitokens.Resource{Kind: apitokens.ResourceEntry, EntryID: "vault-console", Path: []string{"Root", "Internet"}}}, + apitokens.PolicyRule{Effect: apitokens.EffectAllow, Operation: apitokens.OperationCopyURL, Resource: apitokens.Resource{Kind: apitokens.ResourceEntry, EntryID: "vault-console", Path: []string{"Root", "Internet"}}}, + ), + }, + Templates: []vault.Entry{ + { + ID: "website-login", + Title: "Website Login", + Username: "template-user", + Password: "template-password", + URL: "https://example.com", + Notes: "Reusable template for website accounts.", + Fields: map[string]string{ + "Environment": "prod", + }, + Tags: []string{"template", "web"}, + Path: []string{"Templates"}, + }, + }, + } return newTestClientForModel(t, model) } diff --git a/apiapproval/approval.go b/internal/apiapproval/approval.go similarity index 90% rename from apiapproval/approval.go rename to internal/apiapproval/approval.go index b569ae9..022f658 100644 --- a/apiapproval/approval.go +++ b/internal/apiapproval/approval.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "git.julianfamily.org/keepassgo/apitokens" + "git.julianfamily.org/keepassgo/internal/apitokens" ) var ( @@ -22,20 +22,20 @@ var ( type Outcome string const ( - OutcomeAllowOnce Outcome = "allow-once" - OutcomeDenyOnce Outcome = "deny-once" - OutcomeAllowPermanent Outcome = "allow-permanent" - OutcomeDenyPermanent Outcome = "deny-permanent" - OutcomeCancel Outcome = "cancel" + OutcomeAllowOnce Outcome = "allow-once" + OutcomeDenyOnce Outcome = "deny-once" + OutcomeAllowPermanent Outcome = "allow-permanent" + OutcomeDenyPermanent Outcome = "deny-permanent" + OutcomeCancel Outcome = "cancel" ) type Request struct { - ID string - TokenID string - TokenName string - ClientName string - Operation apitokens.Operation - Resource apitokens.Resource + ID string + TokenID string + TokenName string + ClientName string + Operation apitokens.Operation + Resource apitokens.Resource RequestedAt time.Time } diff --git a/apiapproval/approval_test.go b/internal/apiapproval/approval_test.go similarity index 98% rename from apiapproval/approval_test.go rename to internal/apiapproval/approval_test.go index 89bbadd..9d1230d 100644 --- a/apiapproval/approval_test.go +++ b/internal/apiapproval/approval_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "git.julianfamily.org/keepassgo/apitokens" + "git.julianfamily.org/keepassgo/internal/apitokens" ) func TestBrokerCreatesPendingRequestAndAllowsOnce(t *testing.T) { diff --git a/apiaudit/audit.go b/internal/apiaudit/audit.go similarity index 96% rename from apiaudit/audit.go rename to internal/apiaudit/audit.go index f64b1e4..aabdb43 100644 --- a/apiaudit/audit.go +++ b/internal/apiaudit/audit.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "git.julianfamily.org/keepassgo/apitokens" + "git.julianfamily.org/keepassgo/internal/apitokens" ) type EventType string diff --git a/apiaudit/audit_test.go b/internal/apiaudit/audit_test.go similarity index 97% rename from apiaudit/audit_test.go rename to internal/apiaudit/audit_test.go index c42f978..7a13f02 100644 --- a/apiaudit/audit_test.go +++ b/internal/apiaudit/audit_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "git.julianfamily.org/keepassgo/apitokens" + "git.julianfamily.org/keepassgo/internal/apitokens" ) func TestLogKeepsNewestEventsWithinBound(t *testing.T) { diff --git a/apitokens/tokens.go b/internal/apitokens/tokens.go similarity index 99% rename from apitokens/tokens.go rename to internal/apitokens/tokens.go index 267ed52..b23ea60 100644 --- a/apitokens/tokens.go +++ b/internal/apitokens/tokens.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) const ( diff --git a/apitokens/tokens_test.go b/internal/apitokens/tokens_test.go similarity index 99% rename from apitokens/tokens_test.go rename to internal/apitokens/tokens_test.go index c00615c..79f553a 100644 --- a/apitokens/tokens_test.go +++ b/internal/apitokens/tokens_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) func TestTokenEntryRoundTripsThroughVaultEntry(t *testing.T) { diff --git a/appstate/remote_binding.go b/internal/appstate/remote_binding.go similarity index 98% rename from appstate/remote_binding.go rename to internal/appstate/remote_binding.go index f460c56..f7edfa4 100644 --- a/appstate/remote_binding.go +++ b/internal/appstate/remote_binding.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) type SyncMode string diff --git a/appstate/remote_binding_test.go b/internal/appstate/remote_binding_test.go similarity index 99% rename from appstate/remote_binding_test.go rename to internal/appstate/remote_binding_test.go index 8a25ba6..591b03e 100644 --- a/appstate/remote_binding_test.go +++ b/internal/appstate/remote_binding_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) func TestRemoteBindingResolveUsesVaultProfileAndCredentialEntry(t *testing.T) { diff --git a/appstate/state.go b/internal/appstate/state.go similarity index 99% rename from appstate/state.go rename to internal/appstate/state.go index 7dfdc7f..03bfb95 100644 --- a/appstate/state.go +++ b/internal/appstate/state.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "git.julianfamily.org/keepassgo/apiapproval" - "git.julianfamily.org/keepassgo/apitokens" - "git.julianfamily.org/keepassgo/vault" - "git.julianfamily.org/keepassgo/webdav" + "git.julianfamily.org/keepassgo/internal/apiapproval" + "git.julianfamily.org/keepassgo/internal/apitokens" + "git.julianfamily.org/keepassgo/internal/vault" + "git.julianfamily.org/keepassgo/internal/webdav" ) type Section string diff --git a/appstate/state_test.go b/internal/appstate/state_test.go similarity index 99% rename from appstate/state_test.go rename to internal/appstate/state_test.go index e57bbcd..2010960 100644 --- a/appstate/state_test.go +++ b/internal/appstate/state_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "git.julianfamily.org/keepassgo/apiapproval" - "git.julianfamily.org/keepassgo/apitokens" - "git.julianfamily.org/keepassgo/session" - "git.julianfamily.org/keepassgo/vault" - "git.julianfamily.org/keepassgo/webdav" + "git.julianfamily.org/keepassgo/internal/apiapproval" + "git.julianfamily.org/keepassgo/internal/apitokens" + "git.julianfamily.org/keepassgo/internal/session" + "git.julianfamily.org/keepassgo/internal/vault" + "git.julianfamily.org/keepassgo/internal/webdav" ) func TestVisibleEntriesFollowsCurrentPathWithoutSearch(t *testing.T) { diff --git a/internal/appui/app.go b/internal/appui/app.go index 5650081..5bdbec3 100644 --- a/internal/appui/app.go +++ b/internal/appui/app.go @@ -31,18 +31,18 @@ import ( "gioui.org/widget" "gioui.org/widget/material" "gioui.org/x/explorer" - "git.julianfamily.org/keepassgo/api" - "git.julianfamily.org/keepassgo/apiapproval" - "git.julianfamily.org/keepassgo/apiaudit" - "git.julianfamily.org/keepassgo/apitokens" - "git.julianfamily.org/keepassgo/appstate" - keepassassets "git.julianfamily.org/keepassgo/assets" - "git.julianfamily.org/keepassgo/autofillcache" - "git.julianfamily.org/keepassgo/clipboard" - "git.julianfamily.org/keepassgo/passwords" - "git.julianfamily.org/keepassgo/session" - "git.julianfamily.org/keepassgo/vault" - "git.julianfamily.org/keepassgo/webdav" + "git.julianfamily.org/keepassgo/internal/api" + "git.julianfamily.org/keepassgo/internal/apiapproval" + "git.julianfamily.org/keepassgo/internal/apiaudit" + "git.julianfamily.org/keepassgo/internal/apitokens" + "git.julianfamily.org/keepassgo/internal/appstate" + keepassassets "git.julianfamily.org/keepassgo/internal/assets" + "git.julianfamily.org/keepassgo/internal/autofillcache" + "git.julianfamily.org/keepassgo/internal/clipboard" + "git.julianfamily.org/keepassgo/internal/passwords" + "git.julianfamily.org/keepassgo/internal/session" + "git.julianfamily.org/keepassgo/internal/vault" + "git.julianfamily.org/keepassgo/internal/webdav" "golang.org/x/exp/shiny/materialdesign/icons" ) diff --git a/internal/appui/clipboard_gio.go b/internal/appui/clipboard_gio.go index ac753fb..d4033ac 100644 --- a/internal/appui/clipboard_gio.go +++ b/internal/appui/clipboard_gio.go @@ -8,7 +8,7 @@ import ( gioclipboard "gioui.org/io/clipboard" "gioui.org/layout" - appclipboard "git.julianfamily.org/keepassgo/clipboard" + appclipboard "git.julianfamily.org/keepassgo/internal/clipboard" ) type clipboardCommandWriter struct { diff --git a/internal/appui/main_test.go b/internal/appui/main_test.go index fbc4b16..73c7687 100644 --- a/internal/appui/main_test.go +++ b/internal/appui/main_test.go @@ -21,15 +21,15 @@ import ( "gioui.org/unit" "gioui.org/widget" - "git.julianfamily.org/keepassgo/apiapproval" - "git.julianfamily.org/keepassgo/apiaudit" - "git.julianfamily.org/keepassgo/apitokens" - "git.julianfamily.org/keepassgo/appstate" - "git.julianfamily.org/keepassgo/clipboard" - "git.julianfamily.org/keepassgo/passwords" - "git.julianfamily.org/keepassgo/session" - "git.julianfamily.org/keepassgo/vault" - "git.julianfamily.org/keepassgo/webdav" + "git.julianfamily.org/keepassgo/internal/apiapproval" + "git.julianfamily.org/keepassgo/internal/apiaudit" + "git.julianfamily.org/keepassgo/internal/apitokens" + "git.julianfamily.org/keepassgo/internal/appstate" + "git.julianfamily.org/keepassgo/internal/clipboard" + "git.julianfamily.org/keepassgo/internal/passwords" + "git.julianfamily.org/keepassgo/internal/session" + "git.julianfamily.org/keepassgo/internal/vault" + "git.julianfamily.org/keepassgo/internal/webdav" ) func TestMain(m *testing.M) { diff --git a/internal/appui/ui_api.go b/internal/appui/ui_api.go index d1ba144..e2c015d 100644 --- a/internal/appui/ui_api.go +++ b/internal/appui/ui_api.go @@ -10,8 +10,8 @@ import ( "gioui.org/unit" "gioui.org/widget" "gioui.org/widget/material" - "git.julianfamily.org/keepassgo/apiaudit" - "git.julianfamily.org/keepassgo/apitokens" + "git.julianfamily.org/keepassgo/internal/apiaudit" + "git.julianfamily.org/keepassgo/internal/apitokens" ) func apiOperations() []apitokens.Operation { diff --git a/internal/appui/ui_editor.go b/internal/appui/ui_editor.go index f8a8155..7542092 100644 --- a/internal/appui/ui_editor.go +++ b/internal/appui/ui_editor.go @@ -8,9 +8,9 @@ import ( "strings" "gioui.org/widget" - "git.julianfamily.org/keepassgo/clipboard" - "git.julianfamily.org/keepassgo/passwords" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/clipboard" + "git.julianfamily.org/keepassgo/internal/passwords" + "git.julianfamily.org/keepassgo/internal/vault" ) func (u *ui) attachmentInput() (string, []byte, error) { diff --git a/internal/appui/ui_forms.go b/internal/appui/ui_forms.go index eb80c7b..4b3d120 100644 --- a/internal/appui/ui_forms.go +++ b/internal/appui/ui_forms.go @@ -15,7 +15,7 @@ import ( "gioui.org/unit" "gioui.org/widget" "gioui.org/widget/material" - "git.julianfamily.org/keepassgo/appstate" + "git.julianfamily.org/keepassgo/internal/appstate" ) func (u *ui) lifecycleControls(gtx layout.Context) layout.Dimensions { diff --git a/internal/appui/ui_keyboard.go b/internal/appui/ui_keyboard.go index 0c0c70e..302dedc 100644 --- a/internal/appui/ui_keyboard.go +++ b/internal/appui/ui_keyboard.go @@ -6,7 +6,7 @@ import ( "strings" "gioui.org/io/key" - "git.julianfamily.org/keepassgo/appstate" + "git.julianfamily.org/keepassgo/internal/appstate" ) type focusID string diff --git a/internal/appui/ui_preferences.go b/internal/appui/ui_preferences.go index 4ae7040..8cb0edf 100644 --- a/internal/appui/ui_preferences.go +++ b/internal/appui/ui_preferences.go @@ -12,7 +12,7 @@ import ( "gioui.org/unit" "gioui.org/widget" "gioui.org/widget/material" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) const ( diff --git a/internal/appui/ui_shortcuts.go b/internal/appui/ui_shortcuts.go index 6597259..9144b0e 100644 --- a/internal/appui/ui_shortcuts.go +++ b/internal/appui/ui_shortcuts.go @@ -7,7 +7,7 @@ import ( "gioui.org/io/key" "gioui.org/layout" - "git.julianfamily.org/keepassgo/clipboard" + "git.julianfamily.org/keepassgo/internal/clipboard" ) const ( diff --git a/internal/appui/ui_sync_menu_model.go b/internal/appui/ui_sync_menu_model.go index e827f1e..eca8d6f 100644 --- a/internal/appui/ui_sync_menu_model.go +++ b/internal/appui/ui_sync_menu_model.go @@ -4,7 +4,7 @@ import ( "runtime" "strings" - "git.julianfamily.org/keepassgo/appstate" + "git.julianfamily.org/keepassgo/internal/appstate" ) type syncMenuModel struct { diff --git a/assets/assets.go b/internal/assets/assets.go similarity index 100% rename from assets/assets.go rename to internal/assets/assets.go diff --git a/assets/keepassgo-icon.png b/internal/assets/keepassgo-icon.png similarity index 100% rename from assets/keepassgo-icon.png rename to internal/assets/keepassgo-icon.png diff --git a/assets/keepassgo-icon.svg b/internal/assets/keepassgo-icon.svg similarity index 100% rename from assets/keepassgo-icon.svg rename to internal/assets/keepassgo-icon.svg diff --git a/assets/keepassgo-logo-horizontal.png b/internal/assets/keepassgo-logo-horizontal.png similarity index 100% rename from assets/keepassgo-logo-horizontal.png rename to internal/assets/keepassgo-logo-horizontal.png diff --git a/assets/keepassgo-logo-horizontal.svg b/internal/assets/keepassgo-logo-horizontal.svg similarity index 100% rename from assets/keepassgo-logo-horizontal.svg rename to internal/assets/keepassgo-logo-horizontal.svg diff --git a/assets/keepassgo-splash-light.svg b/internal/assets/keepassgo-splash-light.svg similarity index 100% rename from assets/keepassgo-splash-light.svg rename to internal/assets/keepassgo-splash-light.svg diff --git a/assets/keepassgo-splash-square.png b/internal/assets/keepassgo-splash-square.png similarity index 100% rename from assets/keepassgo-splash-square.png rename to internal/assets/keepassgo-splash-square.png diff --git a/assets/keepassgo-splash-square.svg b/internal/assets/keepassgo-splash-square.svg similarity index 100% rename from assets/keepassgo-splash-square.svg rename to internal/assets/keepassgo-splash-square.svg diff --git a/autofillcache/cache.go b/internal/autofillcache/cache.go similarity index 99% rename from autofillcache/cache.go rename to internal/autofillcache/cache.go index e267526..0f84440 100644 --- a/autofillcache/cache.go +++ b/internal/autofillcache/cache.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) type Entry struct { diff --git a/autofillcache/cache_test.go b/internal/autofillcache/cache_test.go similarity index 99% rename from autofillcache/cache_test.go rename to internal/autofillcache/cache_test.go index f47050c..7d65470 100644 --- a/autofillcache/cache_test.go +++ b/internal/autofillcache/cache_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) func TestBuildFiltersAndNormalizesEntries(t *testing.T) { diff --git a/clipboard/service.go b/internal/clipboard/service.go similarity index 97% rename from clipboard/service.go rename to internal/clipboard/service.go index 7ef9ef7..639d67d 100644 --- a/clipboard/service.go +++ b/internal/clipboard/service.go @@ -5,7 +5,7 @@ import ( systemclipboard "github.com/atotto/clipboard" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) var ErrUnsupportedTarget = errors.New("unsupported clipboard target") diff --git a/clipboard/service_test.go b/internal/clipboard/service_test.go similarity index 98% rename from clipboard/service_test.go rename to internal/clipboard/service_test.go index c11730a..a601bb1 100644 --- a/clipboard/service_test.go +++ b/internal/clipboard/service_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - "git.julianfamily.org/keepassgo/vault" + "git.julianfamily.org/keepassgo/internal/vault" ) func TestServiceCopiesUsernamePasswordAndURL(t *testing.T) { diff --git a/passwords/generator.go b/internal/passwords/generator.go similarity index 100% rename from passwords/generator.go rename to internal/passwords/generator.go diff --git a/passwords/generator_test.go b/internal/passwords/generator_test.go similarity index 100% rename from passwords/generator_test.go rename to internal/passwords/generator_test.go diff --git a/session/session.go b/internal/session/session.go similarity index 99% rename from session/session.go rename to internal/session/session.go index 8711559..b59ebbd 100644 --- a/session/session.go +++ b/internal/session/session.go @@ -11,8 +11,8 @@ import ( "slices" "strings" - "git.julianfamily.org/keepassgo/vault" - "git.julianfamily.org/keepassgo/webdav" + "git.julianfamily.org/keepassgo/internal/vault" + "git.julianfamily.org/keepassgo/internal/webdav" ) var ( diff --git a/session/session_test.go b/internal/session/session_test.go similarity index 99% rename from session/session_test.go rename to internal/session/session_test.go index bfda523..d2f38ab 100644 --- a/session/session_test.go +++ b/internal/session/session_test.go @@ -10,8 +10,8 @@ import ( "path/filepath" "testing" - "git.julianfamily.org/keepassgo/vault" - "git.julianfamily.org/keepassgo/webdav" + "git.julianfamily.org/keepassgo/internal/vault" + "git.julianfamily.org/keepassgo/internal/webdav" "github.com/tobischo/gokeepasslib/v3" w "github.com/tobischo/gokeepasslib/v3/wrappers" ) diff --git a/vault/history_test.go b/internal/vault/history_test.go similarity index 100% rename from vault/history_test.go rename to internal/vault/history_test.go diff --git a/vault/kdbx.go b/internal/vault/kdbx.go similarity index 100% rename from vault/kdbx.go rename to internal/vault/kdbx.go diff --git a/vault/kdbx_test.go b/internal/vault/kdbx_test.go similarity index 100% rename from vault/kdbx_test.go rename to internal/vault/kdbx_test.go diff --git a/vault/masterkey.go b/internal/vault/masterkey.go similarity index 100% rename from vault/masterkey.go rename to internal/vault/masterkey.go diff --git a/vault/model.go b/internal/vault/model.go similarity index 100% rename from vault/model.go rename to internal/vault/model.go diff --git a/vault/model_test.go b/internal/vault/model_test.go similarity index 100% rename from vault/model_test.go rename to internal/vault/model_test.go diff --git a/vault/security.go b/internal/vault/security.go similarity index 97% rename from vault/security.go rename to internal/vault/security.go index 618f948..741bd23 100644 --- a/vault/security.go +++ b/internal/vault/security.go @@ -13,10 +13,10 @@ type SecuritySettings struct { } const ( - CipherAES256 = "aes256" + CipherAES256 = "aes256" CipherChaCha20 = "chacha20" - KDFAES = "aes-kdf" - KDFArgon2 = "argon2" + KDFAES = "aes-kdf" + KDFArgon2 = "argon2" ) func SupportedSecuritySettings() (ciphers []string, kdfs []string) { diff --git a/vault/security_test.go b/internal/vault/security_test.go similarity index 100% rename from vault/security_test.go rename to internal/vault/security_test.go diff --git a/webdav/client.go b/internal/webdav/client.go similarity index 100% rename from webdav/client.go rename to internal/webdav/client.go diff --git a/webdav/client_test.go b/internal/webdav/client_test.go similarity index 100% rename from webdav/client_test.go rename to internal/webdav/client_test.go diff --git a/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl b/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl index 275088d..fc6e40b 100644 --- a/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl +++ b/packaging/archlinux/keepassgo-git/PKGBUILD.tmpl @@ -48,9 +48,9 @@ package() { cd "$(_repo_dir)" install -Dm755 keepassgo "${pkgdir}/usr/bin/keepassgo" - install -Dm644 assets/keepassgo-icon.png \ + install -Dm644 internal/assets/keepassgo-icon.png \ "${pkgdir}/usr/share/icons/hicolor/512x512/apps/keepassgo.png" - install -Dm644 assets/keepassgo-icon.svg \ + install -Dm644 internal/assets/keepassgo-icon.svg \ "${pkgdir}/usr/share/icons/hicolor/scalable/apps/keepassgo.svg" install -Dm644 packaging/archlinux/keepassgo-git/keepassgo.desktop \ "${pkgdir}/usr/share/applications/keepassgo.desktop"