kalipso/pentapass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename Namespace -> Vault

Browse Source 
mv into seperate file
This commit is contained in:
kalipso
2024-10-10 12:15:26 +02:00
parent e6d05290fc
commit 069fdf8215
5 changed files with 384 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
cmd/ppass/ppass.go
View File

@@ -37,8 +37,8 @@ var listCmd = &cobra.Command{
}
var names []string
namespace := "root"
err = client.Call("Query.GetAllNames", &namespace, &names)
vault := "root"
err = client.Call("Query.GetAllNames", &vault, &names)
if err != nil {
Logger.Error(err)
@@ -67,14 +67,14 @@ var generateCmd = &cobra.Command{
serviceName := args[0]
var password *crypto.Password
np := rpc.NamespaceService{ Namespace: "root", Service: serviceName }
np := rpc.VaultService{ Vault: "root", Service: serviceName }
err = client.Call("Query.Generate", &np, &password)
if err != nil {
Logger.Error(err)
}
Logger.Info(*password)
Logger.Info(password.Password)
},
}
@@ -94,7 +94,7 @@ var showCmd = &cobra.Command{
serviceName := args[0]
var password *crypto.Password
np := rpc.NamespaceService{ Namespace: "root", Service: serviceName }
np := rpc.VaultService{ Vault: "root", Service: serviceName }
err = client.Call("Query.Get", &np, &password)
if err != nil {
@@ -106,14 +106,14 @@ var showCmd = &cobra.Command{
},
}
var namespaceCmd = &cobra.Command{
Use: "namespace",
Short: "Add, delete or list namespaces",
var vaultCmd = &cobra.Command{
Use: "vault",
Short: "Add, delete or list vaults",
}
var addNamespaceCmd = &cobra.Command{
var addVaultCmd = &cobra.Command{
Use: "add",
Short: "add a namespace",
Short: "add a vault",
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
dbPath, _ := cmd.Flags().GetString("db")
@@ -124,23 +124,23 @@ var addNamespaceCmd = &cobra.Command{
return
}
namespace := args[0]
vault := args[0]
var placeholder int
err = client.Call("Query.AddNamespace", &namespace, &placeholder)
err = client.Call("Query.AddVault", &vault, &placeholder)
if err != nil {
Logger.Error(err)
return
}
Logger.Infof("Namespace %s was added\n", namespace)
Logger.Infof("Vault %s was added\n", vault)
},
}
var deleteNamespaceCmd = &cobra.Command{
var deleteVaultCmd = &cobra.Command{
Use: "delete",
Short: "delete a namespace",
Short: "delete a vault",
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
dbPath, _ := cmd.Flags().GetString("db")
@@ -151,23 +151,23 @@ var deleteNamespaceCmd = &cobra.Command{
return
}
namespace := args[0]
vault := args[0]
var placeholder int
err = client.Call("Query.DeleteNamespace", &namespace, &placeholder)
err = client.Call("Query.DeleteVault", &vault, &placeholder)
if err != nil {
Logger.Error(err)
return
}
Logger.Infof("Namespace %s was deleted\n", namespace)
Logger.Infof("Vault %s was deleted\n", vault)
},
}
var listNamespacesCmd = &cobra.Command{
var listVaultsCmd = &cobra.Command{
Use: "list",
Short: "list all namespaces",
Short: "list all vaults",
Run: func(cmd *cobra.Command, args []string) {
dbPath, _ := cmd.Flags().GetString("db")
client, err := rpc.Receive(dbPath)
@@ -178,14 +178,14 @@ var listNamespacesCmd = &cobra.Command{
}
var reply []string
err = client.Call("Query.ListNamespaces", 0, &reply)
err = client.Call("Query.ListVaults", 0, &reply)
if err != nil {
Logger.Error(err)
return
}
Logger.Info("Namespaces:")
Logger.Info("Vaults:")
for _, ns := range reply {
Logger.Info(ns)
}
@@ -230,19 +230,19 @@ var addPeerCmd = &cobra.Command{
return
}
var namespace string
var vault string
var peerString string
if len(args) == 1 {
namespace = "root"
vault = "root"
peerString = args[0]
} else {
namespace = args[0]
vault = args[0]
peerString = args[1]
}
var success *bool
np := rpc.NamespacePeer{ Namespace: namespace, Peer: peerString }
np := rpc.VaultPeer{ Vault: vault, Peer: peerString }
err = client.Call("Query.AddPeer", &np, &success)
if err != nil {
@@ -250,7 +250,11 @@ var addPeerCmd = &cobra.Command{
return
}
Logger.Info(*success)
if *success {
Logger.Infof("Added peer: %s", peerString)
} else {
Logger.Infof("Could not add peer: %s", peerString)
}
},
}
@@ -267,19 +271,19 @@ var removePeerCmd = &cobra.Command{
return
}
var namespace string
var vault string
var peerString string
if len(args) == 1 {
namespace = "root"
vault = "root"
peerString = args[0]
} else {
namespace = args[0]
vault = args[0]
peerString = args[1]
}
var success *bool
np := rpc.NamespacePeer{ Namespace: namespace, Peer: peerString }
np := rpc.VaultPeer{ Vault: vault, Peer: peerString }
err = client.Call("Query.DeletePeer", &np, &success)
if err != nil {
@@ -287,7 +291,11 @@ var removePeerCmd = &cobra.Command{
return
}
Logger.Info(*success)
if *success {
Logger.Infof("Removed peer: %s", peerString)
} else {
Logger.Infof("Could not find peer: %s", peerString)
}
},
}
@@ -304,26 +312,30 @@ var deleteCmd = &cobra.Command{
return
}
var namespace string
var vault string
var serviceName string
if len(args) == 1 {
namespace = "root"
vault = "root"
serviceName = args[0]
} else {
namespace = args[0]
vault = args[0]
serviceName = args[1]
}
var success *bool
np := rpc.NamespaceService{ Namespace: namespace, Service: serviceName }
np := rpc.VaultService{ Vault: vault, Service: serviceName }
err = client.Call("Query.Delete", &np, &success)
if err != nil {
Logger.Error(err)
}
Logger.Info(*success)
if *success {
Logger.Infof("Deleted password: %s", serviceName)
} else {
Logger.Infof("Could not find password: %s", serviceName)
}
},
}
@@ -336,20 +348,20 @@ func init() {
peerCmd.AddCommand(removePeerCmd)
peerCmd.AddCommand(infoCmd)
namespaceCmd.AddCommand(addNamespaceCmd)
namespaceCmd.AddCommand(deleteNamespaceCmd)
namespaceCmd.AddCommand(listNamespacesCmd)
vaultCmd.AddCommand(addVaultCmd)
vaultCmd.AddCommand(deleteVaultCmd)
vaultCmd.AddCommand(listVaultsCmd)
rootCmd.AddCommand(listCmd)
rootCmd.AddCommand(generateCmd)
rootCmd.AddCommand(showCmd)
rootCmd.AddCommand(deleteCmd)
rootCmd.AddCommand(peerCmd)
rootCmd.AddCommand(namespaceCmd)
rootCmd.AddCommand(vaultCmd)
}
func main() {
InitLogger(true)
InitLogger(false)
if err := rootCmd.Execute(); err != nil {
Logger.Error(err)
os.Exit(1)