From ec572f964527d2f6749aa6ae0fe9db153160e893 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 6 Jun 2021 20:14:39 +0000 Subject: [PATCH] add mising API call --- src/agreements_api.go | 78 ++++++++++++++++++++++++++++++++++++++++++- src/bunker.go | 4 ++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/src/agreements_api.go b/src/agreements_api.go index 2b0eddb..bc82058 100644 --- a/src/agreements_api.go +++ b/src/agreements_api.go @@ -260,7 +260,7 @@ func (e mainEnv) agreementRevokeAll(w http.ResponseWriter, r *http.Request, ps h w.Write([]byte(`{"status":"ok"}`)) } -func (e mainEnv) agreementUserReport(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { +func (e mainEnv) getUserAgreements(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { address := ps.ByName("address") mode := ps.ByName("mode") event := audit("privacy agreements for "+mode, address, mode, address) @@ -326,6 +326,82 @@ func (e mainEnv) agreementUserReport(w http.ResponseWriter, r *http.Request, ps w.Write([]byte(str)) } +func (e mainEnv) getUserAgreement(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { + address := ps.ByName("address") + brief := ps.ByName("brief") + mode := ps.ByName("mode") + event := audit("privacy agreements for "+mode, address, mode, address) + defer func() { event.submit(e.db) }() + + if validateMode(mode) == false { + returnError(w, r, "bad mode", 405, nil, event) + return + } + brief = normalizeBrief(brief) + if isValidBrief(brief) == false { + returnError(w, r, "bad brief format", 405, nil, event) + return + } + exists, err := e.db.checkLegalBasis(brief) + if err != nil { + returnError(w, r, "internal error", 405, err, event) + return + } + if exists == false { + returnError(w, r, "not found", 404, nil, event) + } + userTOKEN := "" + if mode == "token" { + if enforceUUID(w, address, event) == false { + return + } + userBson, _ := e.db.lookupUserRecord(address) + if userBson == nil { + returnError(w, r, "internal error", 405, nil, event) + return + } + if e.enforceAuth(w, r, event) == "" { + return + } + userTOKEN = address + } else { + // TODO: decode url in code! + userBson, _ := e.db.lookupUserRecordByIndex(mode, address, e.conf) + if userBson != nil { + userTOKEN = userBson["token"].(string) + event.Record = userTOKEN + if e.enforceAuth(w, r, event) == "" { + return + } + } else { + if mode == "login" { + returnError(w, r, "internal error", 405, nil, event) + return + } + // else user not found - we allow to save consent for unlinked users! + } + } + // make sure that user is logged in here, unless he wants to cancel emails + if e.enforceAuth(w, r, event) == "" { + return + } + var resultJSON []byte + resultJSON, err = e.db.viewAgreementRecord(userTOKEN, brief) + if err != nil { + returnError(w, r, "internal error", 405, err, event) + return + } + if resultJSON == nil { + returnError(w, r, "not found", 405, err, event) + return + } + //fmt.Printf("Total count of rows: %d\n", numRecords) + w.Header().Set("Content-Type", "application/json; charset=utf-8") + w.WriteHeader(200) + str := fmt.Sprintf(`{"status":"ok","data":%s}`, resultJSON) + w.Write([]byte(str)) +} + /* func (e mainEnv) consentUserRecord(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { address := ps.ByName("address") diff --git a/src/bunker.go b/src/bunker.go index 058c5b3..55ee385 100644 --- a/src/bunker.go +++ b/src/bunker.go @@ -216,10 +216,11 @@ func (e mainEnv) setupRouter() *httprouter.Router { router.POST("/v1/lbasis/:brief", e.createLegalBasis) router.DELETE("/v1/lbasis/:brief", e.deleteLegalBasis) - router.GET("/v1/agreement/:mode/:address", e.agreementUserReport) + router.GET("/v1/agreement/:brief/:mode/:address", e.getUserAgreement) router.POST("/v1/agreement/:brief/:mode/:address", e.agreementAccept) router.DELETE("/v1/agreement/:brief", e.agreementRevokeAll) router.DELETE("/v1/agreement/:brief/:mode/:address", e.agreementWithdraw) + router.GET("/v1/agreements/:mode/:address", e.getUserAgreements) //router.GET("/v1/consent/:mode/:address", e.consentAllUserRecords) //router.GET("/v1/consent/:mode/:address/:brief", e.consentUserRecord) @@ -391,6 +392,7 @@ var HealthCheckerCounter = 0 func logRequest(handler http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + //log.Printf("Set host %s\n", r.Host) autocontext.Set(r, "host", r.Host) w2 := NewCustomResponseWriter(w) w2.Header().Set("Access-Control-Allow-Origin", "*")