rename Namespace -> Vault
mv into seperate file
This commit is contained in:
@@ -20,21 +20,21 @@ var StorageHandler *storage.StorageHandler
|
||||
|
||||
type Query int
|
||||
|
||||
type NamespaceService struct {
|
||||
Namespace string
|
||||
type VaultService struct {
|
||||
Vault string
|
||||
Service string
|
||||
}
|
||||
|
||||
type NamespacePeer struct {
|
||||
Namespace string
|
||||
type VaultPeer struct {
|
||||
Vault string
|
||||
Peer string
|
||||
}
|
||||
|
||||
func (t *Query) Generate(np *NamespaceService, reply *crypto.Password) error {
|
||||
val, ok := StorageHandler.Namespaces[np.Namespace]
|
||||
func (t *Query) Generate(np *VaultService, reply *crypto.Password) error {
|
||||
val, ok := StorageHandler.Vaults[np.Vault]
|
||||
|
||||
if !ok {
|
||||
return fmt.Errorf("Namespace does not exist")
|
||||
return fmt.Errorf("Vault does not exist")
|
||||
}
|
||||
|
||||
password := crypto.NewPassword(crypto.DEFAULT_LENGTH)
|
||||
@@ -59,12 +59,12 @@ func (t *Query) Generate(np *NamespaceService, reply *crypto.Password) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t *Query) Get(np *NamespaceService, reply *crypto.Password) error {
|
||||
namespace := np.Namespace
|
||||
val, ok := StorageHandler.Namespaces[namespace]
|
||||
func (t *Query) Get(np *VaultService, reply *crypto.Password) error {
|
||||
vault := np.Vault
|
||||
val, ok := StorageHandler.Vaults[vault]
|
||||
|
||||
if !ok {
|
||||
return fmt.Errorf("Namespace does not exist")
|
||||
return fmt.Errorf("Vault does not exist")
|
||||
}
|
||||
|
||||
v, err := val.GetPassword(np.Service)
|
||||
@@ -85,12 +85,12 @@ func (t *Query) GetPeerString(_ *int, result *string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t *Query) AddPeer(np *NamespacePeer, success *bool) error {
|
||||
namespace := np.Namespace
|
||||
val, ok := StorageHandler.Namespaces[namespace]
|
||||
func (t *Query) AddPeer(np *VaultPeer, success *bool) error {
|
||||
vault := np.Vault
|
||||
val, ok := StorageHandler.Vaults[vault]
|
||||
|
||||
if !ok {
|
||||
return fmt.Errorf("Namespace does not exist")
|
||||
return fmt.Errorf("Vault does not exist")
|
||||
}
|
||||
|
||||
peer, err := storage.PeerFromString(np.Peer)
|
||||
@@ -107,12 +107,12 @@ func (t *Query) AddPeer(np *NamespacePeer, success *bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t *Query) DeletePeer(np *NamespacePeer, success *bool) error {
|
||||
namespace := np.Namespace
|
||||
val, ok := StorageHandler.Namespaces[namespace]
|
||||
func (t *Query) DeletePeer(np *VaultPeer, success *bool) error {
|
||||
vault := np.Vault
|
||||
val, ok := StorageHandler.Vaults[vault]
|
||||
|
||||
if !ok {
|
||||
return fmt.Errorf("Namespace does not exist")
|
||||
return fmt.Errorf("Vault does not exist")
|
||||
}
|
||||
|
||||
peer, err := storage.PeerFromString(np.Peer)
|
||||
@@ -129,12 +129,12 @@ func (t *Query) DeletePeer(np *NamespacePeer, success *bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t *Query) Delete(np *NamespaceService, success *bool) error {
|
||||
namespace := np.Namespace
|
||||
val, ok := StorageHandler.Namespaces[namespace]
|
||||
func (t *Query) Delete(np *VaultService, success *bool) error {
|
||||
vault := np.Vault
|
||||
val, ok := StorageHandler.Vaults[vault]
|
||||
|
||||
if !ok {
|
||||
return fmt.Errorf("Namespace does not exist")
|
||||
return fmt.Errorf("Vault does not exist")
|
||||
}
|
||||
|
||||
err := val.Delete(np.Service)
|
||||
@@ -147,25 +147,25 @@ func (t *Query) Delete(np *NamespaceService, success *bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t *Query) AddNamespace(namespace *string, _ *int) error {
|
||||
_, err := StorageHandler.AddNamespace(*namespace)
|
||||
func (t *Query) AddVault(vault *string, _ *int) error {
|
||||
_, err := StorageHandler.AddVault(*vault)
|
||||
return err
|
||||
}
|
||||
|
||||
func (t *Query) DeleteNamespace(namespace *string, _ *int) error {
|
||||
err := StorageHandler.DeleteNamespace(*namespace)
|
||||
func (t *Query) DeleteVault(vault *string, _ *int) error {
|
||||
err := StorageHandler.DeleteVault(*vault)
|
||||
return err
|
||||
}
|
||||
|
||||
func (t *Query) ListNamespaces(_ *int, reply *[]string) error {
|
||||
*reply = StorageHandler.ListNamespaces()
|
||||
func (t *Query) ListVaults(_ *int, reply *[]string) error {
|
||||
*reply = StorageHandler.ListVaults()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t *Query) GetAllNames(namespace *string, reply *[]string) error {
|
||||
Logger.Infof("Listing content of %s", *namespace)
|
||||
func (t *Query) GetAllNames(vault *string, reply *[]string) error {
|
||||
Logger.Infof("Listing content of %s", *vault)
|
||||
|
||||
val, ok := StorageHandler.Namespaces[*namespace]
|
||||
val, ok := StorageHandler.Vaults[*vault]
|
||||
|
||||
if !ok {
|
||||
return fmt.Errorf("Namesapce does not exist")
|
||||
|
||||
Reference in New Issue
Block a user