Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1c33963

Browse files
authored
Echo groups (fix#252) (#253)
* Trying out echo groups* Tidy up (two groups. apiGrp and apiAuthGrp* Fix issue with permission handler path
1 parent2654f28 commit1c33963

File tree

2 files changed

+52
-95
lines changed

2 files changed

+52
-95
lines changed

‎handlers/auth.go‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,61 +16,13 @@ import (
1616
var (
1717
// errNotAuthorized is thrown when user wants to access resource which is protected
1818
errNotAuthorized=errors.New("no or invalid jwt token provided. You are not authorized")
19-
20-
// Non-protected URL paths which are prefix checked
21-
nonProtectedPathsPrefix= []string{
22-
"/login",
23-
"/pipeline/githook",
24-
"/worker/register",
25-
"/js/",
26-
"/img/",
27-
"/fonts/",
28-
"/css/",
29-
}
30-
31-
// Non-protected URL paths which are suffix checked
32-
nonProtectedPathsSuffix= []string{
33-
"/trigger",
34-
}
35-
36-
// Non-protected URL paths which are explicitly checked
37-
nonProtectedPaths= []string{
38-
"/",
39-
"/favicon.ico",
40-
}
4119
)
4220

4321
// AuthMiddleware is middleware used for each request. Includes functionality that validates the JWT tokens and user
4422
// permissions.
4523
funcAuthMiddleware(roleAuth*AuthConfig) echo.MiddlewareFunc {
4624
returnfunc(next echo.HandlerFunc) echo.HandlerFunc {
4725
returnfunc(c echo.Context)error {
48-
// Check if it matches an explicit paths
49-
for_,paths:=rangenonProtectedPaths {
50-
ifpaths==c.Path() {
51-
returnnext(c)
52-
}
53-
}
54-
55-
// Check if it matches an prefix-based paths
56-
p:="/api/"+gaia.APIVersion
57-
for_,prefix:=rangenonProtectedPathsPrefix {
58-
switch {
59-
casestrings.HasPrefix(c.Path(),p+prefix):
60-
returnnext(c)
61-
casestrings.HasPrefix(c.Path(),prefix):
62-
returnnext(c)
63-
}
64-
}
65-
66-
// Check if it matches a suffix-based paths
67-
for_,suffix:=rangenonProtectedPathsSuffix {
68-
switch {
69-
casestrings.HasSuffix(c.Path(),suffix):
70-
returnnext(c)
71-
}
72-
}
73-
7426
token,err:=getToken(c)
7527
iferr!=nil {
7628
returnc.String(http.StatusUnauthorized,err.Error())

‎handlers/handler.go‎

Lines changed: 52 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -25,59 +25,67 @@ func (s *GaiaHandler) InitHandlers(e *echo.Echo) error {
2525

2626
// --- Register handlers at echo instance ---
2727

28+
// API router group.
29+
apiGrp:=e.Group(p)
30+
31+
// API router group with auth middleware.
32+
apiAuthGrp:=e.Group(p,AuthMiddleware(&AuthConfig{
33+
RoleCategories:rolehelper.DefaultUserRoles,
34+
}))
35+
2836
// Endpoints for Gaia primary instance
2937
ifgaia.Cfg.Mode==gaia.ModeServer {
3038
// Users
31-
e.POST(p+"login",UserLogin)
32-
e.GET(p+"users",UserGetAll)
33-
e.POST(p+"user/password",UserChangePassword)
34-
e.DELETE(p+"user/:username",UserDelete)
35-
e.GET(p+"user/:username/permissions",UserGetPermissions)
36-
e.PUT(p+"user/:username/permissions",UserPutPermissions)
37-
e.POST(p+"user",UserAdd)
38-
e.PUT(p+"user/:username/reset-trigger-token",UserResetTriggerToken)
39-
40-
perms:=e.Group(p+"permission")
41-
perms.GET("",PermissionGetAll)
39+
apiGrp.POST("login",UserLogin)
40+
41+
apiAuthGrp.GET("users",UserGetAll)
42+
apiAuthGrp.POST("user/password",UserChangePassword)
43+
apiAuthGrp.DELETE("user/:username",UserDelete)
44+
apiAuthGrp.GET("user/:username/permissions",UserGetPermissions)
45+
apiAuthGrp.PUT("user/:username/permissions",UserPutPermissions)
46+
apiAuthGrp.POST("user",UserAdd)
47+
apiAuthGrp.PUT("user/:username/reset-trigger-token",UserResetTriggerToken)
48+
49+
apiAuthGrp.GET("permission",PermissionGetAll)
4250

4351
// Pipelines
4452
// Create pipeline provider
4553
pipelineProvider:=pipelines.NewPipelineProvider(pipelines.Dependencies{
4654
Scheduler:s.deps.Scheduler,
4755
PipelineService:s.deps.PipelineService,
4856
})
49-
e.POST(p+"pipeline",pipelineProvider.CreatePipeline)
50-
e.POST(p+"pipeline/gitlsremote",pipelineProvider.PipelineGitLSRemote)
51-
e.GET(p+"pipeline/name",pipelineProvider.PipelineNameAvailable)
52-
e.POST(p+"pipeline/githook",GitWebHook)
53-
e.GET(p+"pipeline/created",pipelineProvider.CreatePipelineGetAll)
54-
e.GET(p+"pipeline",pipelineProvider.PipelineGetAll)
55-
e.GET(p+"pipeline/:pipelineid",pipelineProvider.PipelineGet)
56-
e.PUT(p+"pipeline/:pipelineid",pipelineProvider.PipelineUpdate)
57-
e.DELETE(p+"pipeline/:pipelineid",pipelineProvider.PipelineDelete)
58-
e.POST(p+"pipeline/:pipelineid/start",pipelineProvider.PipelineStart)
59-
e.POST(p+"pipeline/:pipelineid/:pipelinetoken/trigger",pipelineProvider.PipelineTrigger)
60-
e.PUT(p+"pipeline/:pipelineid/reset-trigger-token",pipelineProvider.PipelineResetToken)
61-
e.GET(p+"pipeline/latest",pipelineProvider.PipelineGetAllWithLatestRun)
62-
e.POST(p+"pipeline/periodicschedules",pipelineProvider.PipelineCheckPeriodicSchedules)
57+
apiAuthGrp.POST("pipeline",pipelineProvider.CreatePipeline)
58+
apiAuthGrp.POST("pipeline/gitlsremote",pipelineProvider.PipelineGitLSRemote)
59+
apiAuthGrp.GET("pipeline/name",pipelineProvider.PipelineNameAvailable)
60+
apiAuthGrp.GET("pipeline/created",pipelineProvider.CreatePipelineGetAll)
61+
apiAuthGrp.GET("pipeline",pipelineProvider.PipelineGetAll)
62+
apiAuthGrp.GET("pipeline/:pipelineid",pipelineProvider.PipelineGet)
63+
apiAuthGrp.PUT("pipeline/:pipelineid",pipelineProvider.PipelineUpdate)
64+
apiAuthGrp.DELETE("pipeline/:pipelineid",pipelineProvider.PipelineDelete)
65+
apiAuthGrp.POST("pipeline/:pipelineid/start",pipelineProvider.PipelineStart)
66+
apiAuthGrp.PUT("pipeline/:pipelineid/reset-trigger-token",pipelineProvider.PipelineResetToken)
67+
apiAuthGrp.GET("pipeline/latest",pipelineProvider.PipelineGetAllWithLatestRun)
68+
apiAuthGrp.POST("pipeline/periodicschedules",pipelineProvider.PipelineCheckPeriodicSchedules)
69+
apiGrp.POST("pipeline/githook",GitWebHook)
70+
apiGrp.POST("pipeline/:pipelineid/:pipelinetoken/trigger",pipelineProvider.PipelineTrigger)
6371

6472
// Settings
65-
e.POST(p+"settings/poll/on",SettingsPollOn)
66-
e.POST(p+"settings/poll/off",SettingsPollOff)
67-
e.GET(p+"settings/poll",SettingsPollGet)
73+
apiAuthGrp.POST("settings/poll/on",SettingsPollOn)
74+
apiAuthGrp.POST("settings/poll/off",SettingsPollOff)
75+
apiAuthGrp.GET("settings/poll",SettingsPollGet)
6876

6977
// PipelineRun
70-
e.POST(p+"pipelinerun/:pipelineid/:runid/stop",pipelineProvider.PipelineStop)
71-
e.GET(p+"pipelinerun/:pipelineid/:runid",pipelineProvider.PipelineRunGet)
72-
e.GET(p+"pipelinerun/:pipelineid",pipelineProvider.PipelineGetAllRuns)
73-
e.GET(p+"pipelinerun/:pipelineid/latest",pipelineProvider.PipelineGetLatestRun)
74-
e.GET(p+"pipelinerun/:pipelineid/:runid/log",pipelineProvider.GetJobLogs)
78+
apiAuthGrp.POST("pipelinerun/:pipelineid/:runid/stop",pipelineProvider.PipelineStop)
79+
apiAuthGrp.GET("pipelinerun/:pipelineid/:runid",pipelineProvider.PipelineRunGet)
80+
apiAuthGrp.GET("pipelinerun/:pipelineid",pipelineProvider.PipelineGetAllRuns)
81+
apiAuthGrp.GET("pipelinerun/:pipelineid/latest",pipelineProvider.PipelineGetLatestRun)
82+
apiAuthGrp.GET("pipelinerun/:pipelineid/:runid/log",pipelineProvider.GetJobLogs)
7583

7684
// Secrets
77-
e.GET(p+"secrets",ListSecrets)
78-
e.DELETE(p+"secret/:key",RemoveSecret)
79-
e.POST(p+"secret",SetSecret)
80-
e.PUT(p+"secret/update",SetSecret)
85+
apiAuthGrp.GET("secrets",ListSecrets)
86+
apiAuthGrp.DELETE("secret/:key",RemoveSecret)
87+
apiAuthGrp.POST("secret",SetSecret)
88+
apiAuthGrp.PUT("secret/update",SetSecret)
8189
}
8290

8391
// Worker
@@ -86,20 +94,17 @@ func (s *GaiaHandler) InitHandlers(e *echo.Echo) error {
8694
Scheduler:s.deps.Scheduler,
8795
Certificate:s.deps.Certificate,
8896
})
89-
e.GET(p+"worker/secret",workerProvider.GetWorkerRegisterSecret)
90-
e.POST(p+"worker/register",workerProvider.RegisterWorker)
91-
e.GET(p+"worker/status",workerProvider.GetWorkerStatusOverview)
92-
e.GET(p+"worker",workerProvider.GetWorker)
93-
e.DELETE(p+"worker/:workerid",workerProvider.DeregisterWorker)
94-
e.POST(p+"worker/secret",workerProvider.ResetWorkerRegisterSecret)
97+
apiAuthGrp.GET("worker/secret",workerProvider.GetWorkerRegisterSecret)
98+
apiAuthGrp.GET("worker/status",workerProvider.GetWorkerStatusOverview)
99+
apiAuthGrp.GET("worker",workerProvider.GetWorker)
100+
apiAuthGrp.DELETE("worker/:workerid",workerProvider.DeregisterWorker)
101+
apiAuthGrp.POST("worker/secret",workerProvider.ResetWorkerRegisterSecret)
102+
apiGrp.POST("worker/register",workerProvider.RegisterWorker)
95103

96104
// Middleware
97105
e.Use(middleware.Recover())
98-
//e.Use(middleware.Logger())
106+
//e.Use(middleware.Logger())
99107
e.Use(middleware.BodyLimit("32M"))
100-
e.Use(AuthMiddleware(&AuthConfig{
101-
RoleCategories:rolehelper.DefaultUserRoles,
102-
}))
103108

104109
// Extra options
105110
e.HideBanner=true

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp