Skip to content

Commit 6ac3349

Browse files
committed
use config file instead of flag to read certs
1 parent b6321d2 commit 6ac3349

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

cmd/verifier/main.go

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/gob"
66
"os"
77
"os/signal"
8+
"proofs/server/v2/zk"
89
"sync"
910
"syscall"
1011
"time"
@@ -17,9 +18,6 @@ import (
1718
"vc/pkg/logger"
1819
"vc/pkg/model"
1920
"vc/pkg/trace"
20-
21-
"flag"
22-
"vc/internal/verifier/zk"
2321
)
2422

2523
func init() {
@@ -37,26 +35,26 @@ func main() {
3735
ctx = context.Background()
3836
services = make(map[string]service)
3937
serviceName string = "verifier"
40-
certs = flag.String("cacerts", "/app/vc/internal/verifier/zk/certs.pem", "File containing issuer CA certs")
41-
circuitDir = flag.String("circuit_dir", "/app/vc/internal/verifier/zk/circuits", "Directory from which to load circuits")
4238
)
4339

44-
flag.Parse()
45-
zk.LoadCircuits(*circuitDir)
40+
cfg, err := configuration.New(ctx, serviceName)
4641

47-
pem, err := os.ReadFile(*certs)
4842
if err != nil {
49-
panic("could not parse cacerts file")
50-
os.Exit(1)
43+
panic(err)
5144
}
52-
if err := zk.LoadIssuerRootCA(pem); err != nil {
53-
panic("could not load issuer root CA")
54-
os.Exit(1)
45+
if cfg.Verifier == nil {
46+
panic("Verifier section is missing from config")
5547
}
48+
certs := cfg.Verifier.ZK.CACertsPath
49+
circuitsDir := cfg.Verifier.ZK.CircuitsPath
50+
zk.LoadCircuits(circuitsDir)
5651

57-
cfg, err := configuration.New(ctx, serviceName)
52+
pem, err := os.ReadFile(certs)
5853
if err != nil {
59-
panic(err)
54+
panic("could not parse cacerts file")
55+
}
56+
if err := zk.LoadIssuerRootCA(pem); err != nil {
57+
panic("could not load issuer root CA")
6058
}
6159

6260
if cfg.Verifier == nil {

config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ verifier:
221221
- vct: "urn:credential:eduid:1"
222222
scopes:
223223
- "eduid"
224+
zk:
225+
ca_certs_path: "/app/vc/internal/verifier/zk/certs.pem"
226+
circuits_path: "/app/vc/internal/verifier/zk/circuits/"
227+
lib_path: "/usr/local/lib"
224228

225229
registry:
226230
api_server:

0 commit comments

Comments
 (0)