From c3b27d847d95318ea099e1d7244c9e196484547d Mon Sep 17 00:00:00 2001 From: yuli Date: Sat, 22 Feb 2025 22:19:35 +0200 Subject: [PATCH] rename few more functions --- src/agreements_api.go | 2 +- src/audit_api.go | 4 ++-- src/bunker.go | 22 +++++++++++----------- src/conf.go | 9 --------- src/lbasis_api.go | 2 +- src/pactivities_api.go | 2 +- src/requests_api.go | 4 ++-- src/sessions_api.go | 2 +- src/userapps_api.go | 4 ++-- src/userlist_api.go | 2 +- src/users_api.go | 1 - 11 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/agreements_api.go b/src/agreements_api.go index aa3428f..0efd505 100644 --- a/src/agreements_api.go +++ b/src/agreements_api.go @@ -218,7 +218,7 @@ func (e mainEnv) agreementRevokeAll(w http.ResponseWriter, r *http.Request, ps h w.Write([]byte(`{"status":"ok"}`)) } -func (e mainEnv) agreementListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) agreementList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { identity := ps.ByName("identity") mode := ps.ByName("mode") event := audit.CreateAuditEvent("get agreements for "+mode, identity, mode, identity) diff --git a/src/audit_api.go b/src/audit_api.go index b980e7a..25aab53 100644 --- a/src/audit_api.go +++ b/src/audit_api.go @@ -68,7 +68,7 @@ func (e mainEnv) EnforceAdmin(w http.ResponseWriter, r *http.Request, event *aud return "" } -func (e mainEnv) auditEventListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) auditEventList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { userTOKEN := ps.ByName("token") event := audit.CreateAuditEvent("view audit events", userTOKEN, "token", userTOKEN) defer func() { SaveAuditEvent(event, e.db, e.conf) }() @@ -99,7 +99,7 @@ func (e mainEnv) auditEventListForUser(w http.ResponseWriter, r *http.Request, p w.Write([]byte(str)) } -func (e mainEnv) auditEventList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) auditEventListAll(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { if e.EnforceAdmin(w, r, nil) == "" { return } diff --git a/src/bunker.go b/src/bunker.go index 80aabd7..ccc6896 100644 --- a/src/bunker.go +++ b/src/bunker.go @@ -205,7 +205,7 @@ func (e mainEnv) setupRouter() *httprouter.Router { router.GET("/v1/sys/backup", e.backupDB) router.POST("/v1/user", e.userCreate) - router.POST("/v1/users", e.userList) + router.POST("/v1/users", e.userListAll) router.GET("/v1/user/:mode/:identity", e.userGet) router.DELETE("/v1/user/:mode/:identity", e.userDelete) router.PUT("/v1/user/:mode/:identity", e.userChange) @@ -225,16 +225,16 @@ func (e mainEnv) setupRouter() *httprouter.Router { router.GET("/v1/request/:request", e.userReqGet) router.POST("/v1/request/:request", e.userReqApprove) router.DELETE("/v1/request/:request", e.userReqCancel) - router.GET("/v1/requests/:mode/:identity", e.userReqListForUser) - router.GET("/v1/requests", e.userReqList) + router.GET("/v1/requests/:mode/:identity", e.userReqList) + router.GET("/v1/requests", e.userReqListAll) - router.GET("/v1/pactivity", e.pactivityList) + router.GET("/v1/pactivity", e.pactivityListAll) router.POST("/v1/pactivity/:activity", e.pactivityCreate) router.DELETE("/v1/pactivity/:activity", e.pactivityDelete) router.POST("/v1/pactivity/:activity/:brief", e.pactivityLink) router.DELETE("/v1/pactivity/:activity/:brief", e.pactivityUnlink) - router.GET("/v1/lbasis", e.legalBasisList) + router.GET("/v1/lbasis", e.legalBasisListAll) router.POST("/v1/lbasis/:brief", e.legalBasisCreate) router.DELETE("/v1/lbasis/:brief", e.legalBasisDelete) @@ -242,7 +242,7 @@ func (e mainEnv) setupRouter() *httprouter.Router { router.POST("/v1/agreement/:brief/:mode/:identity", e.agreementAccept) router.DELETE("/v1/agreement/:brief", e.agreementRevokeAll) router.DELETE("/v1/agreement/:brief/:mode/:identity", e.agreementWithdraw) - router.GET("/v1/agreements/:mode/:identity", e.agreementListForUser) + router.GET("/v1/agreements/:mode/:identity", e.agreementList) //router.GET("/v1/consent/:mode/:identity", e.consentAllUserRecords) //router.GET("/v1/consent/:mode/:identity/:brief", e.consentUserRecord) @@ -251,19 +251,19 @@ func (e mainEnv) setupRouter() *httprouter.Router { router.GET("/v1/userapp/:mode/:identity/:appname", e.userappGet) router.PUT("/v1/userapp/:mode/:identity/:appname", e.userappChange) router.DELETE("/v1/userapp/:mode/:identity/:appname", e.userappDelete) - router.GET("/v1/userapp/:mode/:identity", e.userappListForUser) - router.GET("/v1/userapps", e.userappList) + router.GET("/v1/userapp/:mode/:identity", e.userappList) + router.GET("/v1/userapps", e.userappListNames) router.GET("/v1/session/:session", e.sessionGet) router.POST("/v1/session/:session", e.sessionCreate) router.DELETE("/v1/session/:session", e.sessionDelete) //router.POST("/v1/sessions/:mode/:identity", e.sessionNewOld) - router.GET("/v1/sessions/:mode/:identity", e.sessionListForUser) + router.GET("/v1/sessions/:mode/:identity", e.sessionList) router.GET("/v1/metrics", e.metrics) - router.GET("/v1/audit/admin", e.auditEventList) - router.GET("/v1/audit/list/:token", e.auditEventListForUser) + router.GET("/v1/audit/admin", e.auditEventListAll) + router.GET("/v1/audit/list/:token", e.auditEventList) router.GET("/v1/audit/get/:atoken", e.auditEventGet) router.GET("/v1/captcha/:code", e.showCaptcha) diff --git a/src/conf.go b/src/conf.go index f8160c4..0d64f9d 100644 --- a/src/conf.go +++ b/src/conf.go @@ -68,15 +68,6 @@ func (dbobj dbcon) GetTenantAdmin(cfg Config) string { return cfg.Generic.AdminEmail } -func (e mainEnv) pluginUserDelete(pluginid string, userTOKEN string) { - // not implemented -} - -func (e mainEnv) pluginUserLookup(email string) string { - // not implemented - return "" -} - func (dbobj dbcon) GlobalUserChangeEmail(oldEmail string, newEmail string) { // not implemented } diff --git a/src/lbasis_api.go b/src/lbasis_api.go index 3b1fe3f..5c1873c 100644 --- a/src/lbasis_api.go +++ b/src/lbasis_api.go @@ -97,7 +97,7 @@ func (e mainEnv) legalBasisDelete(w http.ResponseWriter, r *http.Request, ps htt w.Write([]byte(`{"status":"ok"}`)) } -func (e mainEnv) legalBasisList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) legalBasisListAll(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { if e.EnforceAdmin(w, r, nil) == "" { return } diff --git a/src/pactivities_api.go b/src/pactivities_api.go index 79bb102..5d72805 100644 --- a/src/pactivities_api.go +++ b/src/pactivities_api.go @@ -121,7 +121,7 @@ func (e mainEnv) pactivityUnlink(w http.ResponseWriter, r *http.Request, ps http w.Write([]byte(`{"status":"ok"}`)) } -func (e mainEnv) pactivityList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) pactivityListAll(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { if e.EnforceAdmin(w, r, nil) == "" { return } diff --git a/src/requests_api.go b/src/requests_api.go index d152079..1bb5e56 100644 --- a/src/requests_api.go +++ b/src/requests_api.go @@ -12,7 +12,7 @@ import ( ) // This function retrieves all requests that require admin approval. This function supports result pager. -func (e mainEnv) userReqList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) userReqListAll(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { event := audit.CreateAuditEvent("view user requests", "", "", "") if e.EnforceAdmin(w, r, event) == "" { return @@ -42,7 +42,7 @@ func (e mainEnv) userReqList(w http.ResponseWriter, r *http.Request, ps httprout } // Get list of requests for specific user -func (e mainEnv) userReqListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) userReqList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { identity := ps.ByName("identity") mode := ps.ByName("mode") event := audit.CreateAuditEvent("get user privacy requests", identity, mode, identity) diff --git a/src/sessions_api.go b/src/sessions_api.go index 292863a..2863fa0 100644 --- a/src/sessions_api.go +++ b/src/sessions_api.go @@ -144,7 +144,7 @@ func (e mainEnv) sessionNewOld(w http.ResponseWriter, r *http.Request, ps httpro fmt.Fprintf(w, `{"status":"ok","session":"%s"}`, sessionID) } -func (e mainEnv) sessionListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) sessionList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { identity := ps.ByName("identity") mode := ps.ByName("mode") event := audit.CreateAuditEvent("get all user sessions", identity, mode, identity) diff --git a/src/userapps_api.go b/src/userapps_api.go index 1810b5b..7d7b0ca 100644 --- a/src/userapps_api.go +++ b/src/userapps_api.go @@ -122,7 +122,7 @@ func (e mainEnv) userappChange(w http.ResponseWriter, r *http.Request, ps httpro fmt.Fprintf(w, `{"status":"ok","result":"%s","rtoken":"%s"}`, rstatus, rtoken) } -func (e mainEnv) userappListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) userappList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { identity := ps.ByName("identity") mode := ps.ByName("mode") event := audit.CreateAuditEvent("get user app list by "+mode, identity, mode, identity) @@ -197,7 +197,7 @@ func (e mainEnv) userappDelete(w http.ResponseWriter, r *http.Request, ps httpro w.Write([]byte(finalJSON)) } -func (e mainEnv) userappList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) userappListNames(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { if e.EnforceAuth(w, r, nil) == "" { return } diff --git a/src/userlist_api.go b/src/userlist_api.go index 2a9d6ac..b2c3943 100644 --- a/src/userlist_api.go +++ b/src/userlist_api.go @@ -9,7 +9,7 @@ import ( "github.com/securitybunker/databunker/src/utils" ) -func (e mainEnv) userList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) userListAll(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { if e.EnforceAdmin(w, r, nil) == "" { return } diff --git a/src/users_api.go b/src/users_api.go index cdb50fd..5360f80 100644 --- a/src/users_api.go +++ b/src/users_api.go @@ -332,7 +332,6 @@ func (e mainEnv) userPrelogin(w http.ResponseWriter, r *http.Request, ps httprou if mode == "email" { //notifyURL := e.conf.Notification.NotificationURL //notifyBadLogin(notifyURL, mode, identity) - e.pluginUserLookup(identity) //utils.ReturnError(w, r, "record not found", 405, errors.New("record not found"), event) captcha, _ := generateCaptcha() w.Header().Set("Content-Type", "application/json; charset=utf-8")