1943731786

Committed 23 Jul 2025 12:52PM UTC coverage: 65.476% (-0.005%) from 65.481%

Build # 1943731786

Build Type

Pull #805

gitlab-ci

Committed by

alfrunes

Commit Message

test: Fix tests making invalid assertions for request body

Signed-off-by: Alf-Rune Siqveland <alf.rune@northern.tech>

Pull Request Pull Request #805: Revert to absolute API paths and group router by middleware

Run Details

87 of 97 new or added lines in 3 files covered. (89.69%)

1099 existing lines in 18 files now uncovered.

32143 of 49091 relevant lines covered (65.48%)

1.39 hits per line

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

98.95

/backend/services/deviceauth/api/http/routing.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 http

import (
        "net/http"
        "strings"

        "github.com/gin-gonic/gin"

        "github.com/mendersoftware/mender-server/pkg/contenttype"
        "github.com/mendersoftware/mender-server/pkg/identity"
        "github.com/mendersoftware/mender-server/pkg/requestsize"
        "github.com/mendersoftware/mender-server/pkg/routing"
        dconfig "github.com/mendersoftware/mender-server/services/deviceauth/config"
        "github.com/mendersoftware/mender-server/services/deviceauth/devauth"
        "github.com/mendersoftware/mender-server/services/deviceauth/store"
        "github.com/mendersoftware/mender-server/services/deviceauth/utils"
)

const (
        apiUrlDevicesV1 = "/api/devices/v1/authentication"
        uriAuthReqs     = "/auth_requests"

        // internal API
        apiUrlInternalV1      = "/api/internal/v1/devauth"
        uriAlive              = "/alive"
        uriHealth             = "/health"
        uriTokenVerify        = "/tokens/verify"
        uriTenantLimit        = "/tenant/:id/limits/:name"
        uriTokens             = "/tokens"
        uriTenants            = "/tenants"
        uriTenantDevice       = "/tenants/:tid/devices/:did"
        uriTenantDeviceStatus = "/tenants/:tid/devices/:did/status"
        uriTenantDevices      = "/tenants/:tid/devices"
        uriTenantDevicesCount = "/tenants/:tid/devices/count"

        // management API v2
        apiUrlManagementV2       = "/api/management/v2/devauth"
        v2uriDevices             = "/devices"
        v2uriDevicesCount        = "/devices/count"
        v2uriDevicesSearch       = "/devices/search"
        v2uriDevice              = "/devices/:id"
        v2uriDeviceAuthSet       = "/devices/:id/auth/:aid"
        v2uriDeviceAuthSetStatus = "/devices/:id/auth/:aid/status"
        v2uriToken               = "/tokens/:id"
        v2uriDevicesLimit        = "/limits/:name"

        HdrAuthReqSign = "X-MEN-Signature"
)

type HttpOptionsGenerator func(methods []string) gin.HandlerFunc

func AllowHeaderOptionsGenerator(methods []string) gin.HandlerFunc {
        // return a dummy handler for now
        return func(c *gin.Context) {
                for _, m := range methods {
                        c.Writer.Header().Add("Allow", m)
                }
        }
}

func supportsMethod(method string, methods []string) bool {
        return utils.ContainsString(method, methods)
}

// Automatically add OPTIONS method support for each defined route,
// only if there's no OPTIONS handler for that route yet
func AutogenOptionsRoutes(router *gin.Engine, gen HttpOptionsGenerator) {

        routes := router.Routes()
        methodGroups := make(map[string][]string, len(routes))

        for _, route := range routes {
                if strings.HasPrefix(route.Path, "/api/internal") {
                        continue
                }
                methods, ok := methodGroups[route.Path]
                if !ok {
                        methods = make([]string, 0)
                }

                methodGroups[route.Path] = append(methods, route.Method)
        }

        for route, methods := range methodGroups {
                // skip if there's a handler for OPTIONS already
                if !supportsMethod(http.MethodOptions, methods) {
                        router.OPTIONS(route, gen(methods))
                }
        }

}

type Config struct {
        MaxRequestSize int64
}

func NewConfig() *Config {
        return &Config{
                MaxRequestSize: dconfig.SettingMaxRequestSizeDefault,
        }
}

type Option func(c *Config)

func SetMaxRequestSize(size int64) Option {
        return func(c *Config) {
                c.MaxRequestSize = size
        }
}

func NewRouter(app devauth.App, db store.DataStore, options ...Option) http.Handler {
        config := NewConfig()
        for _, option := range options {
                if option != nil {
                        option(config)
                }
        }

        router := routing.NewGinRouter()
        router.Use(requestsize.Middleware(config.MaxRequestSize))

        d := NewDevAuthApiHandlers(app, db)

        publicAPIs := router.Group(".")
        publicAPIs.Use(identity.Middleware())

        mgmtAPIV2 := publicAPIs.Group(apiUrlManagementV2)
        devicesAPIs := router.Group(apiUrlDevicesV1)

        // Devices API
        devicesAPIs.Group(".").Use(contenttype.CheckJSON()).
                POST(uriAuthReqs, d.SubmitAuthRequestHandler)

        // API v2
        mgmtAPIV2.GET(v2uriDevicesCount, d.GetDevicesCountHandler)
        mgmtAPIV2.GET(v2uriDevices, d.GetDevicesV2Handler)
        mgmtAPIV2.GET(v2uriDevice, d.GetDeviceV2Handler)
        mgmtAPIV2.GET(v2uriDeviceAuthSetStatus, d.GetAuthSetStatusHandler)
        mgmtAPIV2.GET(v2uriDevicesLimit, d.GetLimitHandler)
        mgmtAPIV2.DELETE(v2uriDevice, d.DecommissionDeviceHandler)
        mgmtAPIV2.DELETE(v2uriDeviceAuthSet, d.DeleteDeviceAuthSetHandler)
        mgmtAPIV2.DELETE(v2uriToken, d.DeleteTokenHandler)
        mgmtAPIV2.Group(".").Use(contenttype.CheckJSON()).
                POST(v2uriDevices, d.PostDevicesV2Handler).
                PUT(v2uriDeviceAuthSetStatus, d.UpdateDeviceStatusHandler).
                POST(v2uriDevicesSearch, d.SearchDevicesV2Handler)

        // automatically add Option routes for public endpoints
        AutogenOptionsRoutes(router, AllowHeaderOptionsGenerator)

        intrnlAPIV1 := router.Group(apiUrlInternalV1)

        intrnlAPIV1.GET(uriAlive, d.AliveHandler)
        intrnlAPIV1.GET(uriHealth, d.HealthCheckHandler)
        intrnlAPIV1.GET(uriTokenVerify,
                identity.Middleware(),
                d.VerifyTokenHandler)
        intrnlAPIV1.POST(uriTokenVerify,
                identity.Middleware(),
                d.VerifyTokenHandler)
        intrnlAPIV1.DELETE(uriTokens, d.DeleteTokensHandler)
        intrnlAPIV1.PUT(uriTenantLimit, d.PutTenantLimitHandler)
        intrnlAPIV1.GET(uriTenantLimit, d.GetTenantLimitHandler)
        intrnlAPIV1.DELETE(uriTenantLimit, d.DeleteTenantLimitHandler)
        intrnlAPIV1.POST(uriTenants, d.ProvisionTenantHandler)
        intrnlAPIV1.GET(uriTenantDeviceStatus, d.GetTenantDeviceStatus)
        intrnlAPIV1.GET(uriTenantDevices, d.GetTenantDevicesHandler)
        intrnlAPIV1.GET(uriTenantDevicesCount, d.GetTenantDevicesCountHandler)
        intrnlAPIV1.DELETE(uriTenantDevice, d.DeleteDeviceHandler)

        return router
}

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	package http
15
16	import (
17	"net/http"
18	"strings"
19
20	"github.com/gin-gonic/gin"
21
22	"github.com/mendersoftware/mender-server/pkg/contenttype"
23	"github.com/mendersoftware/mender-server/pkg/identity"
24	"github.com/mendersoftware/mender-server/pkg/requestsize"
25	"github.com/mendersoftware/mender-server/pkg/routing"
26	dconfig "github.com/mendersoftware/mender-server/services/deviceauth/config"
27	"github.com/mendersoftware/mender-server/services/deviceauth/devauth"
28	"github.com/mendersoftware/mender-server/services/deviceauth/store"
29	"github.com/mendersoftware/mender-server/services/deviceauth/utils"
30	)
31
32	const (
33	apiUrlDevicesV1 = "/api/devices/v1/authentication"
34	uriAuthReqs = "/auth_requests"
35
36	// internal API
37	apiUrlInternalV1 = "/api/internal/v1/devauth"
38	uriAlive = "/alive"
39	uriHealth = "/health"
40	uriTokenVerify = "/tokens/verify"
41	uriTenantLimit = "/tenant/:id/limits/:name"
42	uriTokens = "/tokens"
43	uriTenants = "/tenants"
44	uriTenantDevice = "/tenants/:tid/devices/:did"
45	uriTenantDeviceStatus = "/tenants/:tid/devices/:did/status"
46	uriTenantDevices = "/tenants/:tid/devices"
47	uriTenantDevicesCount = "/tenants/:tid/devices/count"
48
49	// management API v2
50	apiUrlManagementV2 = "/api/management/v2/devauth"
51	v2uriDevices = "/devices"
52	v2uriDevicesCount = "/devices/count"
53	v2uriDevicesSearch = "/devices/search"
54	v2uriDevice = "/devices/:id"
55	v2uriDeviceAuthSet = "/devices/:id/auth/:aid"
56	v2uriDeviceAuthSetStatus = "/devices/:id/auth/:aid/status"
57	v2uriToken = "/tokens/:id"
58	v2uriDevicesLimit = "/limits/:name"
59
60	HdrAuthReqSign = "X-MEN-Signature"
61	)
62
63	type HttpOptionsGenerator func(methods []string) gin.HandlerFunc
64
65	func AllowHeaderOptionsGenerator(methods []string) gin.HandlerFunc {	3✔
66	// return a dummy handler for now	3✔
67	return func(c *gin.Context) {	4✔
68	for _, m := range methods {	2✔
69	c.Writer.Header().Add("Allow", m)	1✔
70	}	1✔
71	}
72	}
73
74	func supportsMethod(method string, methods []string) bool {	3✔
75	return utils.ContainsString(method, methods)	3✔
76	}	3✔
77
78	// Automatically add OPTIONS method support for each defined route,
79	// only if there's no OPTIONS handler for that route yet
80	func AutogenOptionsRoutes(router *gin.Engine, gen HttpOptionsGenerator) {	3✔
81		3✔
82	routes := router.Routes()	3✔
83	methodGroups := make(map[string][]string, len(routes))	3✔
84		3✔
85	for _, route := range routes {	6✔
86	if strings.HasPrefix(route.Path, "/api/internal") {	3✔
UNCOV 87	continue	×
88	}
89	methods, ok := methodGroups[route.Path]	3✔
90	if !ok {	6✔
91	methods = make([]string, 0)	3✔
92	}	3✔
93
94	methodGroups[route.Path] = append(methods, route.Method)	3✔
95	}
96
97	for route, methods := range methodGroups {	6✔
98	// skip if there's a handler for OPTIONS already	3✔
99	if !supportsMethod(http.MethodOptions, methods) {	6✔
100	router.OPTIONS(route, gen(methods))	3✔
101	}	3✔
102	}
103
104	}
105
106	type Config struct {
107	MaxRequestSize int64
108	}
109
110	func NewConfig() *Config {	3✔
111	return &Config{	3✔
112	MaxRequestSize: dconfig.SettingMaxRequestSizeDefault,	3✔
113	}	3✔
114	}	3✔
115
116	type Option func(c *Config)
117
118	func SetMaxRequestSize(size int64) Option {	2✔
119	return func(c *Config) {	4✔
120	c.MaxRequestSize = size	2✔
121	}	2✔
122	}
123
124	func NewRouter(app devauth.App, db store.DataStore, options ...Option) http.Handler {	3✔
125	config := NewConfig()	3✔
126	for _, option := range options {	5✔
127	if option != nil {	4✔
128	option(config)	2✔
129	}	2✔
130	}
131
132	router := routing.NewGinRouter()	3✔
133	router.Use(requestsize.Middleware(config.MaxRequestSize))	3✔
134		3✔
135	d := NewDevAuthApiHandlers(app, db)	3✔
136		3✔
137	publicAPIs := router.Group(".")	3✔
138	publicAPIs.Use(identity.Middleware())	3✔
139		3✔
140	mgmtAPIV2 := publicAPIs.Group(apiUrlManagementV2)	3✔
141	devicesAPIs := router.Group(apiUrlDevicesV1)	3✔
142		3✔
143	// Devices API	3✔
144	devicesAPIs.Group(".").Use(contenttype.CheckJSON()).	3✔
145	POST(uriAuthReqs, d.SubmitAuthRequestHandler)	3✔
146		3✔
147	// API v2	3✔
148	mgmtAPIV2.GET(v2uriDevicesCount, d.GetDevicesCountHandler)	3✔
149	mgmtAPIV2.GET(v2uriDevices, d.GetDevicesV2Handler)	3✔
150	mgmtAPIV2.GET(v2uriDevice, d.GetDeviceV2Handler)	3✔
151	mgmtAPIV2.GET(v2uriDeviceAuthSetStatus, d.GetAuthSetStatusHandler)	3✔
152	mgmtAPIV2.GET(v2uriDevicesLimit, d.GetLimitHandler)	3✔
153	mgmtAPIV2.DELETE(v2uriDevice, d.DecommissionDeviceHandler)	3✔
154	mgmtAPIV2.DELETE(v2uriDeviceAuthSet, d.DeleteDeviceAuthSetHandler)	3✔
155	mgmtAPIV2.DELETE(v2uriToken, d.DeleteTokenHandler)	3✔
156	mgmtAPIV2.Group(".").Use(contenttype.CheckJSON()).	3✔
157	POST(v2uriDevices, d.PostDevicesV2Handler).	3✔
158	PUT(v2uriDeviceAuthSetStatus, d.UpdateDeviceStatusHandler).	3✔
159	POST(v2uriDevicesSearch, d.SearchDevicesV2Handler)	3✔
160		3✔
161	// automatically add Option routes for public endpoints	3✔
162	AutogenOptionsRoutes(router, AllowHeaderOptionsGenerator)	3✔
163		3✔
164	intrnlAPIV1 := router.Group(apiUrlInternalV1)	3✔
165		3✔
166	intrnlAPIV1.GET(uriAlive, d.AliveHandler)	3✔
167	intrnlAPIV1.GET(uriHealth, d.HealthCheckHandler)	3✔
168	intrnlAPIV1.GET(uriTokenVerify,	3✔
169	identity.Middleware(),	3✔
170	d.VerifyTokenHandler)	3✔
171	intrnlAPIV1.POST(uriTokenVerify,	3✔
172	identity.Middleware(),	3✔
173	d.VerifyTokenHandler)	3✔
174	intrnlAPIV1.DELETE(uriTokens, d.DeleteTokensHandler)	3✔
175	intrnlAPIV1.PUT(uriTenantLimit, d.PutTenantLimitHandler)	3✔
176	intrnlAPIV1.GET(uriTenantLimit, d.GetTenantLimitHandler)	3✔
177	intrnlAPIV1.DELETE(uriTenantLimit, d.DeleteTenantLimitHandler)	3✔
178	intrnlAPIV1.POST(uriTenants, d.ProvisionTenantHandler)	3✔
179	intrnlAPIV1.GET(uriTenantDeviceStatus, d.GetTenantDeviceStatus)	3✔
180	intrnlAPIV1.GET(uriTenantDevices, d.GetTenantDevicesHandler)	3✔
181	intrnlAPIV1.GET(uriTenantDevicesCount, d.GetTenantDevicesCountHandler)	3✔
182	intrnlAPIV1.DELETE(uriTenantDevice, d.DeleteDeviceHandler)	3✔
183		3✔
184	return router	3✔
185	}

mendersoftware / mender-server / 1943731786

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