Merge pull request #39 from rarimo/fix/callback-get-user

Add support of v2 verification with custom event_data in callback end…

Author: Dmytro-Hladkykh

Dockerfile

@@ -1,11 +1,13 @@
-FROM golang:1.22.0-alpine as buildbase
+FROM golang:1.23.0-alpine as buildbase
 
 ARG CI_JOB_TOKEN
 
 RUN apk add git build-base ca-certificates
 
 WORKDIR /go/src/github.com/rarimo/verificator-svc
-COPY . .
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
 
 RUN git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com".insteadOf https://gitlab.com
 RUN git config --global url."https://${CI_JOB_TOKEN}@github.com/".insteadOf https://github.com/
@@ -24,4 +26,4 @@ COPY --from=buildbase /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=buildbase /go/src/github.com/rarimo/verificator-svc/proof_keys/passport.json /proof_keys/passport.json
 
 
-ENTRYPOINT ["verificator-svc"]
+ENTRYPOINT ["verificator-svc"]

internal/data/pg/verify_users.go

@@ -175,3 +175,12 @@ func (q *VerifyUsersQ) FilterByNullifier(nullifier string) data.VerifyUsersQ {
 	q.sel = q.sel.Where(sq.Eq{"nullifier": nullifier})
 	return q
 }
+
+func (q *VerifyUsersQ) FilterByEventData(eventData string) data.VerifyUsersQ {
+	q.sel = q.sel.Where(sq.And{
+		sq.Eq{"event_data": eventData},
+		sq.NotEq{"event_data": ""},
+		sq.Expr("event_data IS NOT NULL"),
+	})
+	return q
+}

internal/data/verify_users.go

@@ -49,4 +49,5 @@ type VerifyUsersQ interface {
 	WhereCreatedAtLt(createdAt time.Time) VerifyUsersQ
 	FilterByInternalAID(aid string) VerifyUsersQ
 	FilterByNullifier(nullifier string) VerifyUsersQ
+	FilterByEventData(eventData string) VerifyUsersQ
 }

internal/service/handlers/verification_callback.go

@@ -78,27 +78,37 @@ func VerificationCallback(w http.ResponseWriter, r *http.Request) {
 	nullifier.FillBytes(nullifierBytes[:])
 	nullifierHex := hex.EncodeToString(nullifierBytes[:])
 
-	userIDHash, err := helpers.ExtractEventData(getter)
+	eventDataFromProof, err := helpers.ExtractEventData(getter)
 	if err != nil {
-		ctx.Log(r).WithError(err).Errorf("failed to extract user hash from event data")
+		ctx.Log(r).WithError(err).Errorf("failed to extract event data")
 		ape.RenderErr(w, problems.BadRequest(validation.Errors{
 			"pub_signals/event_data": err,
 		})...)
 		return
 	}
 
-	verifiedUser, err := ctx.VerifyUsersQ(r).WhereHashID(userIDHash).Get()
+	verifiedUser, err := ctx.VerifyUsersQ(r).FilterByEventData(eventDataFromProof).Get()
 	if err != nil {
-		ctx.Log(r).WithError(err).Errorf("failed to get user with userHashID [%s]", userIDHash)
-		ape.RenderErr(w, problems.BadRequest(err)...)
+		ctx.Log(r).WithError(err).Error("failed to get user with event_data")
+		ape.RenderErr(w, problems.InternalError())
 		return
 	}
+
+	if verifiedUser == nil {
+		verifiedUser, err = ctx.VerifyUsersQ(r).WhereHashID(eventDataFromProof).Get()
+		if err != nil {
+			ctx.Log(r).WithError(err).Error("failed to get user with user_id_hash")
+			ape.RenderErr(w, problems.InternalError())
+			return
+		}
+	}
+
 	if verifiedUser == nil {
 		ctx.Log(r).WithFields(logan.F{
 			"event_data":   getter.Get(zk.EventData),
-			"user_id_hash": userIDHash,
+			"user_id_hash": eventDataFromProof,
 			"id":           req.Data.ID,
-		}).Error("user not found or eventData != userHashID")
+		}).Error("user not found")
 		ape.RenderErr(w, problems.NotFound())
 		return
 	}
@@ -169,7 +179,7 @@ func VerificationCallback(w http.ResponseWriter, r *http.Request) {
 				"service_timestamp":              ctx.Verifiers(r).ServiceStartTimestamp,
 				"identity_timestamp_upper_bound": identityTimestampUpperBound,
 				"identity_counter_upper_bound":   identityCounterUpperBound,
-				"user_id_hash":                   userIDHash,
+				"user_id_hash":                   eventDataFromProof,
 			}).Errorf("failed to check uniqueness")
 			verifiedUser.Status = "uniqueness_check_failed"
 		}