1056932186

Committed 25 Oct 2023 05:42PM UTC coverage: 83.607% (-1.0%) from 84.604%

Build # 1056932186

Build Type

push

gitlab-ci

Committed by

web-flow

Commit Message

Merge pull request #674 from tranchitella/men-6775

feat: support for Ed25519 server keys for signing the JWT tokens

Run Details

121 of 137 new or added lines in 5 files covered. (88.32%)

2 existing lines in 1 file now uncovered.

4789 of 5728 relevant lines covered (83.61%)

47.01 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

71.43

/server.go

// Copyright 2023 Northern.tech AS
//
//    Licensed under the Apache License, Version 2.0 (the "License");
//    you may not use this file except in compliance with the License.
//    You may obtain a copy of the License at
//
//        http://www.apache.org/licenses/LICENSE-2.0
//
//    Unless required by applicable law or agreed to in writing, software
//    distributed under the License is distributed on an "AS IS" BASIS,
//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//    See the License for the specific language governing permissions and
//    limitations under the License.

package main

import (
        "net/http"
        "time"

        "github.com/ant0ine/go-json-rest/rest"
        "github.com/mendersoftware/go-lib-micro/config"
        "github.com/mendersoftware/go-lib-micro/log"
        "github.com/pkg/errors"

        api_http "github.com/mendersoftware/deviceauth/api/http"
        "github.com/mendersoftware/deviceauth/cache"
        "github.com/mendersoftware/deviceauth/client/orchestrator"
        "github.com/mendersoftware/deviceauth/client/tenant"
        dconfig "github.com/mendersoftware/deviceauth/config"
        "github.com/mendersoftware/deviceauth/devauth"
        "github.com/mendersoftware/deviceauth/jwt"
        "github.com/mendersoftware/deviceauth/store/mongo"
)

func SetupAPI(stacktype string) (*rest.Api, error) {
        api := rest.NewApi()
        if err := SetupMiddleware(api, stacktype); err != nil {
                return nil, errors.Wrap(err, "failed to setup middleware")
        }

        //this will override the framework's error resp to the desired one:
        // {"error": "msg"}
        // instead of:
        // {"Error": "msg"}
        rest.ErrorFieldName = "error"

        return api, nil
}

func RunServer(c config.Reader) error {
        var tenantadmAddr = c.GetString(dconfig.SettingTenantAdmAddr)

        l := log.New(log.Ctx{})

        db, err := mongo.NewDataStoreMongo(
                mongo.DataStoreMongoConfig{
                        ConnectionString: c.GetString(dconfig.SettingDb),

                        SSL:           c.GetBool(dconfig.SettingDbSSL),
                        SSLSkipVerify: c.GetBool(dconfig.SettingDbSSLSkipVerify),

                        Username: c.GetString(dconfig.SettingDbUsername),
                        Password: c.GetString(dconfig.SettingDbPassword),
                })
        if err != nil {
                return errors.Wrap(err, "database connection failed")
        }

        jwtHandler, err := jwt.NewJWTHandler(
                c.GetString(dconfig.SettingServerPrivKeyPath),
        )
        var jwtFallbackHandler jwt.Handler
        fallback := c.GetString(dconfig.SettingServerFallbackPrivKeyPath)
        if err == nil && fallback != "" {
                jwtFallbackHandler, err = jwt.NewJWTHandler(
                        fallback,
                )
        }
        if err != nil {
                return err
        }

        orchClientConf := orchestrator.Config{
                OrchestratorAddr: c.GetString(dconfig.SettingOrchestratorAddr),
                Timeout:          time.Duration(30) * time.Second,
        }

        devauth := devauth.NewDevAuth(db,
                orchestrator.NewClient(orchClientConf),
                jwtHandler,
                devauth.Config{
                        Issuer:             c.GetString(dconfig.SettingJWTIssuer),
                        ExpirationTime:     int64(c.GetInt(dconfig.SettingJWTExpirationTimeout)),
                        DefaultTenantToken: c.GetString(dconfig.SettingDefaultTenantToken),
                        InventoryAddr:      config.Config.GetString(dconfig.SettingInventoryAddr),

                        EnableReporting: config.Config.GetBool(dconfig.SettingEnableReporting),
                        HaveAddons: config.Config.GetBool(dconfig.SettingHaveAddons) &&
                                tenantadmAddr != "",
                })

        if jwtFallbackHandler != nil {
                devauth = devauth.WithJWTFallbackHandler(jwtFallbackHandler)
        }

        if tenantadmAddr != "" {
                tc := tenant.NewClient(tenant.Config{
                        TenantAdmAddr: tenantadmAddr,
                })
                devauth = devauth.WithTenantVerification(tc)
        }

        if cacheAddr := c.GetString(dconfig.SettingRedisAddr); cacheAddr != "" {
                l.Infof("setting up redis cache")

                cache, err := cache.NewRedisCache(cacheAddr,
                        c.GetString(dconfig.SettingRedisUsername),
                        c.GetString(dconfig.SettingRedisPassword),
                        c.GetInt(dconfig.SettingRedisDb),
                        c.GetInt(dconfig.SettingRedisTimeoutSec),
                        c.GetInt(dconfig.SettingRedisLimitsExpSec),
                )

                if err != nil {
                        return err
                }

                devauth = devauth.WithCache(cache)
        }

        api, err := SetupAPI(c.GetString(dconfig.SettingMiddleware))
        if err != nil {
                return errors.Wrap(err, "API setup failed")
        }

        devauthapi := api_http.NewDevAuthApiHandlers(devauth, db)

        apph, err := devauthapi.GetApp()
        if err != nil {
                return errors.Wrap(err, "device authentication API handlers setup failed")
        }
        api.SetApp(apph)

        addr := c.GetString(dconfig.SettingListen)
        l.Printf("listening on %s", addr)

        return http.ListenAndServe(addr, api.MakeHandler())
}

1	// Copyright 2023 Northern.tech AS
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14
15	package main
16
17	import (
18	"net/http"
19	"time"
20
21	"github.com/ant0ine/go-json-rest/rest"
22	"github.com/mendersoftware/go-lib-micro/config"
23	"github.com/mendersoftware/go-lib-micro/log"
24	"github.com/pkg/errors"
25
26	api_http "github.com/mendersoftware/deviceauth/api/http"
27	"github.com/mendersoftware/deviceauth/cache"
28	"github.com/mendersoftware/deviceauth/client/orchestrator"
29	"github.com/mendersoftware/deviceauth/client/tenant"
30	dconfig "github.com/mendersoftware/deviceauth/config"
31	"github.com/mendersoftware/deviceauth/devauth"
32	"github.com/mendersoftware/deviceauth/jwt"
33	"github.com/mendersoftware/deviceauth/store/mongo"
34	)
35
36	func SetupAPI(stacktype string) (*rest.Api, error) {	3✔
37	api := rest.NewApi()	3✔
38	if err := SetupMiddleware(api, stacktype); err != nil {	4✔
39	return nil, errors.Wrap(err, "failed to setup middleware")	1✔
40	}	1✔
41
42	//this will override the framework's error resp to the desired one:
43	// {"error": "msg"}
44	// instead of:
45	// {"Error": "msg"}
46	rest.ErrorFieldName = "error"	2✔
47		2✔
48	return api, nil	2✔
49	}
50
51	func RunServer(c config.Reader) error {	1✔
52	var tenantadmAddr = c.GetString(dconfig.SettingTenantAdmAddr)	1✔
53		1✔
54	l := log.New(log.Ctx{})	1✔
55		1✔
56	db, err := mongo.NewDataStoreMongo(	1✔
57	mongo.DataStoreMongoConfig{	1✔
58	ConnectionString: c.GetString(dconfig.SettingDb),	1✔
59		1✔
60	SSL: c.GetBool(dconfig.SettingDbSSL),	1✔
61	SSLSkipVerify: c.GetBool(dconfig.SettingDbSSLSkipVerify),	1✔
62		1✔
63	Username: c.GetString(dconfig.SettingDbUsername),	1✔
64	Password: c.GetString(dconfig.SettingDbPassword),	1✔
65	})	1✔
66	if err != nil {	1✔
67	return errors.Wrap(err, "database connection failed")	×
68	}	×
69
70	jwtHandler, err := jwt.NewJWTHandler(	1✔
71	c.GetString(dconfig.SettingServerPrivKeyPath),	1✔
72	)	1✔
73	var jwtFallbackHandler jwt.Handler	1✔
74	fallback := c.GetString(dconfig.SettingServerFallbackPrivKeyPath)	1✔
75	if err == nil && fallback != "" {	1✔
NEW 76	jwtFallbackHandler, err = jwt.NewJWTHandler(	×
NEW 77	fallback,	×
NEW 78	)	×
NEW 79	}	×
80	if err != nil {	1✔
NEW 81	return err	×
NEW 82	}	×
83
84	orchClientConf := orchestrator.Config{	1✔
85	OrchestratorAddr: c.GetString(dconfig.SettingOrchestratorAddr),	1✔
86	Timeout: time.Duration(30) * time.Second,	1✔
87	}	1✔
88		1✔
89	devauth := devauth.NewDevAuth(db,	1✔
90	orchestrator.NewClient(orchClientConf),	1✔
91	jwtHandler,	1✔
92	devauth.Config{	1✔
93	Issuer: c.GetString(dconfig.SettingJWTIssuer),	1✔
94	ExpirationTime: int64(c.GetInt(dconfig.SettingJWTExpirationTimeout)),	1✔
95	DefaultTenantToken: c.GetString(dconfig.SettingDefaultTenantToken),	1✔
96	InventoryAddr: config.Config.GetString(dconfig.SettingInventoryAddr),	1✔
97		1✔
98	EnableReporting: config.Config.GetBool(dconfig.SettingEnableReporting),	1✔
99	HaveAddons: config.Config.GetBool(dconfig.SettingHaveAddons) &&	1✔
100	tenantadmAddr != "",	1✔
101	})	1✔
102		1✔
103	if jwtFallbackHandler != nil {	1✔
NEW 104	devauth = devauth.WithJWTFallbackHandler(jwtFallbackHandler)	×
NEW 105	}	×
106
107	if tenantadmAddr != "" {	2✔
108	tc := tenant.NewClient(tenant.Config{	1✔
109	TenantAdmAddr: tenantadmAddr,	1✔
110	})	1✔
111	devauth = devauth.WithTenantVerification(tc)	1✔
112	}	1✔
113
114	if cacheAddr := c.GetString(dconfig.SettingRedisAddr); cacheAddr != "" {	1✔
115	l.Infof("setting up redis cache")	×
116		×
117	cache, err := cache.NewRedisCache(cacheAddr,	×
118	c.GetString(dconfig.SettingRedisUsername),	×
119	c.GetString(dconfig.SettingRedisPassword),	×
120	c.GetInt(dconfig.SettingRedisDb),	×
121	c.GetInt(dconfig.SettingRedisTimeoutSec),	×
122	c.GetInt(dconfig.SettingRedisLimitsExpSec),	×
123	)	×
124		×
125	if err != nil {	×
126	return err	×
127	}	×
128
129	devauth = devauth.WithCache(cache)	×
130	}
131
132	api, err := SetupAPI(c.GetString(dconfig.SettingMiddleware))	1✔
133	if err != nil {	1✔
134	return errors.Wrap(err, "API setup failed")	×
135	}	×
136
137	devauthapi := api_http.NewDevAuthApiHandlers(devauth, db)	1✔
138		1✔
139	apph, err := devauthapi.GetApp()	1✔
140	if err != nil {	1✔
141	return errors.Wrap(err, "device authentication API handlers setup failed")	×
142	}	×
143	api.SetApp(apph)	1✔
144		1✔
145	addr := c.GetString(dconfig.SettingListen)	1✔
146	l.Printf("listening on %s", addr)	1✔
147		1✔
148	return http.ListenAndServe(addr, api.MakeHandler())	1✔
149	}

mendersoftware / deviceauth / 1056932186

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous