diff --git a/docker-compose.yml b/docker-compose.yml index 161d59ef86..fa717b50bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,9 @@ vetinari: - "8080:8080" - "4444:4444" rufus: + volumes: + - /dev/bus/usb/003/010:/dev/bus/usb/002/010 + - /var/run/pcscd/pcscd.comm:/var/run/pcscd/pcscd.comm build: ../rufus ports: - "7899:7899" diff --git a/server/handlers/default.go b/server/handlers/default.go index 6db8759ad1..b27af958b8 100644 --- a/server/handlers/default.go +++ b/server/handlers/default.go @@ -38,8 +38,9 @@ func MainHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *err // AddHandler accepts urls in the form // func AddHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *errors.HTTPError { - log.Printf("AddHandler") vars := mux.Vars(r) + log.Printf("AddHandler request for images name: %s and tag: %s", vars["imageName"], vars["tag"]) + local := store.DBStore(db, vars["imageName"]) // parse body for correctness meta := data.FileMeta{} @@ -103,9 +104,10 @@ func AddHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *erro // RemoveHandler accepts urls in the form // func RemoveHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *errors.HTTPError { - log.Printf("RemoveHandler") // remove tag from tagets list vars := mux.Vars(r) + log.Printf("RemoveHandler request for images name: %s and tag: %s", vars["imageName"], vars["tag"]) + local := store.DBStore(db, vars["imageName"]) local.RemoveBlob(vars["tag"]) tufRepo, err := repo.NewRepo(ctx.Trust(), local, "sha256", "sha512") @@ -149,9 +151,10 @@ func RemoveHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *e // GetHandler accepts urls in the form //.json func GetHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *errors.HTTPError { - log.Printf("GetHandler") // generate requested file and serve vars := mux.Vars(r) + log.Printf("GetHandler request for image name: %s and tuf-file: %s", vars["imageName"], vars["tufFile"]) + local := store.DBStore(db, vars["imageName"]) meta, err := local.GetMeta() @@ -168,9 +171,10 @@ func GetHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *erro // GenKeysHandler is the handler for generate keys endpoint func GenKeysHandler(ctx utils.Context, w http.ResponseWriter, r *http.Request) *errors.HTTPError { - log.Printf("GenKeysHandler") // remove tag from tagets list vars := mux.Vars(r) + log.Printf("GenKeysHandler request for: %s", vars["imageName"]) + local := store.DBStore(db, vars["imageName"]) tufRepo, err := repo.NewRepo(ctx.Trust(), local, "sha256", "sha512") if err != nil { diff --git a/server/rufus_trust.go b/server/rufus_trust.go index 119989d673..196277988f 100644 --- a/server/rufus_trust.go +++ b/server/rufus_trust.go @@ -28,11 +28,9 @@ func newRufusSigner(hostname string, port string, tlscafile string) *RufusSigner if err != nil { log.Fatalf("fail to read: %v", err) } - log.Println("before dial") opts = append(opts, grpc.WithTransportCredentials(creds)) - log.Println("after dial") conn, err := grpc.Dial(netAddr, opts...) - log.Println("finished dial") + if err != nil { log.Fatalf("fail to dial: %v", err) } diff --git a/server/server.go b/server/server.go index dd5e7d2334..9d42b9333d 100644 --- a/server/server.go +++ b/server/server.go @@ -36,7 +36,6 @@ func Run(ctx context.Context, conf *config.Configuration) error { log.Printf("error loading keys %s", err) return err } - log.Println("loaded x509") tlsConfig := &tls.Config{ MinVersion: tls.VersionTLS12, @@ -55,17 +54,14 @@ func Run(ctx context.Context, conf *config.Configuration) error { Rand: rand.Reader, } - log.Println("resolving tcpaddr") tcpAddr, err := net.ResolveTCPAddr("tcp", conf.Server.Addr) if err != nil { return err } - log.Println("setup listen tcp") lsnr, err := net.ListenTCP("tcp", tcpAddr) if err != nil { return err } - log.Println("new listener") tlsLsnr := tls.NewListener(lsnr, tlsConfig) // This is a basic way to shutdown the running listeners. @@ -79,7 +75,6 @@ func Run(ctx context.Context, conf *config.Configuration) error { tlsLsnr.Close() }() - log.Println("roothandlerfactory") hand := utils.RootHandlerFactory(&utils.InsecureAuthorizer{}, utils.NewContext, trust) r := mux.NewRouter() @@ -89,7 +84,6 @@ func Run(ctx context.Context, conf *config.Configuration) error { r.Methods("DELETE").Path("/{imageName:.*}/{tag:[a-zA-Z0-9]+}").Handler(hand(handlers.RemoveHandler, utils.SSDelete)) r.Methods("POST").Path("/{imageName:.*}/{tag:[a-zA-Z0-9]+}").Handler(hand(handlers.AddHandler, utils.SSUpdate)) - log.Println("server") server := http.Server{ Addr: conf.Server.Addr, Handler: r,