diff --git a/internal/config/passpor_verifier.go b/internal/config/passpor_verifier.go index cc5ff9e..78807b6 100644 --- a/internal/config/passpor_verifier.go +++ b/internal/config/passpor_verifier.go @@ -3,14 +3,14 @@ package config import ( "fmt" + "github.com/rarimo/geo-auth-svc/internal/zkp" zk "github.com/rarimo/zkverifier-kit" "gitlab.com/distributed_lab/figure/v3" "gitlab.com/distributed_lab/kit/kv" ) const ( - proofEventIDValue = "111186066134341633902189494613533900917417361106374681011849132651019822199" - proofSelectorValue = "219681" + proofSelectorValue = "236065" maxIdentityCount = 1 documentTypeID = "ID" ) @@ -37,7 +37,7 @@ func (c *config) PassportVerifier() *zk.Verifier { zk.WithAgeAbove(cfg.AllowedAge), zk.WithIdentityVerifier(c.ProvideVerifier()), zk.WithProofSelectorValue(proofSelectorValue), - zk.WithEventID(proofEventIDValue), + zk.WithEventID(zkp.EventIDValue), zk.WithIdentitiesCounter(maxIdentityCount), zk.WithIdentitiesCreationTimestampLimit(cfg.AllowedIdentityTimestamp), zk.WithDocumentType(documentTypeID), diff --git a/internal/zkp/main.go b/internal/zkp/main.go index 8bf49b0..9f8e1a1 100644 --- a/internal/zkp/main.go +++ b/internal/zkp/main.go @@ -69,8 +69,8 @@ func (v *AuthVerifier) VerifyProof(user string, proof *zkptypes.ZKProof) (err er switch { case proof.PubSignals[NullifierSignalsIndex] != user: return fmt.Errorf("expected user=%s, got %s", user, proof.PubSignals[NullifierSignalsIndex]) - case proof.PubSignals[EventIDSignalsIndex] != EventID: - return fmt.Errorf("expected eventID=%s, got %s", EventID, proof.PubSignals[EventIDSignalsIndex]) + case proof.PubSignals[EventIDSignalsIndex] != EventIDValue: + return fmt.Errorf("expected eventID=%s, got %s", EventIDValue, proof.PubSignals[EventIDSignalsIndex]) case proof.PubSignals[EventDataSignalsIndex] != chalDec: return fmt.Errorf("expected challenge=%s, got %s", chalDec, proof.PubSignals[EventDataSignalsIndex]) } diff --git a/internal/zkp/types.go b/internal/zkp/types.go index afbb799..a1114b4 100644 --- a/internal/zkp/types.go +++ b/internal/zkp/types.go @@ -20,12 +20,11 @@ const ( EventDataSignalsIndex = 3 ) -const EventID = "211985299740800702300256033401632392934377086534111448880928528431996790315" - const ChallengeExpirationDelta = 5 * time.Minute +const EventIDValue = "111186066134341633902189494613533900917417361106374681011849132651019822199" + var NullifierRegexp = regexp.MustCompile("^0x[0-9a-fA-F]{64}$") -var AIDRegexp = regexp.MustCompile("^[0-9a-f]{64}$") type Challenge struct { Value string