remove dependencies

This commit is contained in:
ston1th 2024-10-13 03:06:35 +02:00
commit 1656b91e3b
107 changed files with 567 additions and 7772 deletions

View file

@ -43,7 +43,13 @@ func newHandler(ctx *types.Context) {
ctx.Err(types.ErrInvalid)
return
}
key, err := ctx.Data.DB.CreateKey(newKey.Name, newKey.Existing, newKey.Size, newKey.Encoding, newKey.Type)
key, err := ctx.DB().CreateKey(
newKey.Name,
newKey.Existing,
newKey.Size,
newKey.Encoding,
newKey.Type,
)
if err != nil {
ctx.Log.Error(err, "error writing key", "name", newKey.Name)
ctx.Err(types.ErrISE)
@ -56,7 +62,8 @@ func newHandler(ctx *types.Context) {
func keyHandler(ctx *types.Context) {
id := ctx.Var("id")
ip := ctx.ClientIP()
k, err := ctx.Data.DB.GetKey(id)
db := ctx.DB()
k, err := db.GetKey(id)
if err != nil {
ctx.Log.Error(err, "error reading key", "id", id)
if err == store.ErrKeyNotFound {
@ -68,9 +75,10 @@ func keyHandler(ctx *types.Context) {
}
switch ctx.Method() {
case "GET":
a := ctx.Approver()
aid := ctx.Var("aid")
if aid == "" {
aid, err = ctx.Data.Approver.New(id, k.Name, ip)
aid, err = a.New(id, k.Name, ip)
if err != nil {
ctx.Log.Error(err, "error creating approval", "id", id, "name", k.Name)
ctx.Err(types.ErrTooManyApprovals)
@ -79,7 +87,7 @@ func keyHandler(ctx *types.Context) {
ctx.Redirect(schema.ApproveURL(id, aid), http.StatusFound)
return
}
s := ctx.Data.Approver.Status(id, aid, ip)
s := a.Status(id, aid, ip)
switch s {
case types.Pending:
ctx.Redirect(schema.ApproveURL(id, aid), http.StatusFound)
@ -91,7 +99,7 @@ func keyHandler(ctx *types.Context) {
ctx.Err(types.ErrReqNotFound)
return
}
k, err := ctx.Data.DB.GetKeyWithSecret(id)
k, err := db.GetKeyWithSecret(id)
if err != nil {
ctx.Log.Error(err, "error reading key", "id", id)
if err == store.ErrKeyNotFound {
@ -103,7 +111,7 @@ func keyHandler(ctx *types.Context) {
}
ctx.JSON(schema.Key(k))
case "DELETE":
err = ctx.Data.DB.DeleteKey(id)
err = db.DeleteKey(id)
if err != nil {
ctx.Log.Error(err, "error deleting key", "id", id, "name", k.Name)
if err == store.ErrKeyNotFound {
@ -118,12 +126,12 @@ func keyHandler(ctx *types.Context) {
}
func reqListHandler(ctx *types.Context) {
l := ctx.Data.Approver.List()
l := ctx.Approver().List()
ctx.JSON(schema.NewApprovals(l))
}
func keyListHandler(ctx *types.Context) {
k, err := ctx.Data.DB.GetKeys()
k, err := ctx.DB().GetKeys()
if err != nil {
ctx.Log.Error(err, "error reading keys")
ctx.Err(types.ErrISE)
@ -141,7 +149,7 @@ func reqHandler(ctx *types.Context) {
case "DELETE":
status = types.Rejected
}
err := ctx.Data.Approver.Update(id, status)
err := ctx.Approver().Update(id, status)
if err != nil {
ctx.Log.Error(err, "error updating key request")
ctx.Err(types.ErrReqNotFound)