taldir

commit 4721d5a9c4f084f4b30cede3eb695aa398131cff
parent 2e31a2377f88ea9e7292bf56c55c22526b07c329
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Wed,  6 Jul 2022 18:07:15 +0200

new taldir ecs

Diffstat:
M
Makefile
 | 
8
++++++++
M
cmd/taldir-server/main.go
 | 
7
++++---

2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -2,6 +2,12 @@ all: server cli
 
 SCRIPT_TARGET:=$(shell dirname $(shell go list -f '{{.Target}}' ./cmd/taldir-server))
 
+gana:
+	git submodule update --init --recursive
+	git submodule sync --recursive
+	cd contrib/gana/gnu-taler-error-codes && make taler_error_codes.go
+	cp contrib/gana/gnu-taler-error-codes/taler_error_codes.go gana/
+
 server:
 	go build ./cmd/taldir-server
 
@@ -12,3 +18,5 @@ install: server cli
 	go install ./cmd/taldir-server && go install ./cmd/taldir-cli
 	chmod +x scripts/*
 	cp scripts/* $(SCRIPT_TARGET)
+
+.PHONY: all gana
diff --git a/cmd/taldir-server/main.go b/cmd/taldir-server/main.go
@@ -42,6 +42,7 @@ import (
   "gorm.io/gorm"
   "encoding/base64"
   "taler.net/taldir/util"
+  "taler.net/taldir/gana"
   "crypto/sha512"
   "gorm.io/driver/postgres"
   "gopkg.in/ini.v1"
@@ -310,7 +311,7 @@ func registerRequest(w http.ResponseWriter, r *http.Request){
   }
   err := json.NewDecoder(r.Body).Decode(&req)
   if err != nil {
-    errDetail.Code = 1006 //TALER_EC_JSON_INVALID
+    errDetail.Code = gana.GENERIC_JSON_INVALID
     errDetail.Hint = "Unable to parse JSON"
     resp, _ := json.Marshal(errDetail)
     w.WriteHeader(400)
@@ -318,7 +319,7 @@ func registerRequest(w http.ResponseWriter, r *http.Request){
     return
   }
   if !validators[vars["method"]] {
-    errDetail.Code = 3 //TALER_EC_NOT_IMPLEMENTED
+    errDetail.Code = gana.TALDIR_METHOD_NOT_SUPPORTED
     errDetail.Hint = "Unsupported method"
     errDetail.Detail = "Given method: " + vars["method"]
     resp, _ := json.Marshal(errDetail)
@@ -342,7 +343,7 @@ func registerRequest(w http.ResponseWriter, r *http.Request){
     if time.Now().UnixMicro() < earliestReRegistration {
       w.WriteHeader(429)
       rlResponse := RateLimitedResponse{
-        Code: 23, //FIXME TALER_EC_TALDIR_REGISTER_RATE_LIMITED
+        Code: gana.TALDIR_REGISTER_RATE_LIMITED
         RequestFrequency: reqFrequency,
         Hint: "Registration rate limit reached",
       }