Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
322dce7
specs
Shivam-nagar23 Feb 10, 2025
138105a
specs
Shivam-nagar23 Feb 10, 2025
c2840c2
specs for generic api
Shivam-nagar23 Feb 11, 2025
18fbf7e
specs for generic api update
Shivam-nagar23 Feb 11, 2025
78c62db
access manager generic apis
Shivam-nagar23 Feb 12, 2025
d4e37fb
enforcements
Shivam-nagar23 Feb 12, 2025
e8ef17b
version changed to alpha1
Shivam-nagar23 Feb 12, 2025
9babb91
specs udpate
Shivam-nagar23 Feb 12, 2025
e80919b
version
Shivam-nagar23 Feb 12, 2025
2a06a3d
sql scripts
Shivam-nagar23 Feb 14, 2025
2e8d88a
role group service refactoring
Shivam-nagar23 Feb 14, 2025
a4f3e5d
role group service
Shivam-nagar23 Feb 14, 2025
355d506
sql script chnages
Shivam-nagar23 Feb 14, 2025
2e45765
sql scripts chnages
Shivam-nagar23 Feb 14, 2025
04a7385
refactoring iss
Shivam-nagar23 Feb 14, 2025
91bd157
reafctoring and rbac changes
Shivam-nagar23 Feb 17, 2025
cf99d8b
get rbac changes
Shivam-nagar23 Feb 18, 2025
8e8ec51
policy moved to bean
Shivam-nagar23 Feb 19, 2025
3dc10bb
removed unnecessary code
Shivam-nagar23 Feb 19, 2025
bc1954c
v2 routes in oss
Shivam-nagar23 Feb 19, 2025
e97436f
Merge branch 'feat-access-manager-1' into feat-access-manager-2
Shivam-nagar23 Feb 19, 2025
80392b1
Merge branch 'feat-access-manager-2' into feat-access-manager-3
Shivam-nagar23 Feb 19, 2025
24c88af
sql script chnaged
Shivam-nagar23 Feb 19, 2025
9407b53
sql script changes
Shivam-nagar23 Feb 19, 2025
431835a
sql script changeS
Shivam-nagar23 Feb 19, 2025
85ad553
fetch role group chnages
Shivam-nagar23 Feb 19, 2025
cb6ef50
set keys
Shivam-nagar23 Feb 19, 2025
fcf20cf
description update
Shivam-nagar23 Feb 19, 2025
83e0946
description update
Shivam-nagar23 Feb 19, 2025
1b16787
actuion
Shivam-nagar23 Feb 19, 2025
d30c610
Merge branch 'develop' into feat-access-manager
Shivam-nagar23 Feb 20, 2025
5a0c578
Merge branch 'feat-access-manager' into feat-access-manager-1
Shivam-nagar23 Feb 20, 2025
2c78ddb
Merge branch 'feat-access-manager-1' into feat-access-manager-2
Shivam-nagar23 Feb 20, 2025
0b59ea4
Merge branch 'feat-access-manager-2' into feat-access-manager-3
Shivam-nagar23 Feb 20, 2025
85614cd
review comments
Shivam-nagar23 Feb 20, 2025
89e86db
review comments
Shivam-nagar23 Feb 20, 2025
c3df8a0
idempotent
Shivam-nagar23 Feb 20, 2025
05155f2
hide permissions set
Shivam-nagar23 Feb 20, 2025
bef1dae
Merge pull request #6404 from devtron-labs/feat-access-manager-3
Shivam-nagar23 Feb 20, 2025
3fa8b46
Merge branch 'feat-access-manager-1' into feat-access-manager-2
Shivam-nagar23 Feb 20, 2025
118b9b5
Merge pull request #6403 from devtron-labs/feat-access-manager-2
Shivam-nagar23 Feb 20, 2025
c4bd448
Merge branch 'feat-access-manager' into feat-access-manager-1
Shivam-nagar23 Feb 20, 2025
5cda912
Merge pull request #6400 from devtron-labs/feat-access-manager-1
Shivam-nagar23 Feb 20, 2025
0309eb6
Merge branch 'develop' into feat-access-manager
Shivam-nagar23 Feb 20, 2025
ba27a06
oss ent sync
Shivam-nagar23 Feb 20, 2025
9a11c16
oss change
Shivam-nagar23 Feb 20, 2025
cce2e63
oss sync
Shivam-nagar23 Feb 20, 2025
210669b
sync
Shivam-nagar23 Feb 20, 2025
f836c4f
self register bean
Shivam-nagar23 Feb 21, 2025
5da69c8
user bean import
Shivam-nagar23 Feb 21, 2025
8b576c6
oss merge
Shivam-nagar23 Feb 21, 2025
ce3748b
signature changes
Shivam-nagar23 Feb 21, 2025
1526d6a
oss sync
Shivam-nagar23 Feb 21, 2025
4a106a9
oss refactoring
Shivam-nagar23 Feb 21, 2025
8fb2539
oss ent sync
Shivam-nagar23 Feb 21, 2025
1cf3888
final role filters to be considered
Shivam-nagar23 Feb 21, 2025
a955875
sync changes
Shivam-nagar23 Feb 21, 2025
be29ab1
audit creation oss
Shivam-nagar23 Feb 21, 2025
82a23ea
user service
Shivam-nagar23 Feb 21, 2025
1d51d6c
oss sycn
Shivam-nagar23 Feb 21, 2025
b057ed1
osse nt sync
Shivam-nagar23 Feb 21, 2025
d972d37
cluster entity
Shivam-nagar23 Feb 23, 2025
ebf3157
user service refactoring
Shivam-nagar23 Feb 23, 2025
79ceb16
oss sync
Shivam-nagar23 Feb 23, 2025
01aea38
user service refactoring
Shivam-nagar23 Feb 23, 2025
9936acd
user common service chnages
Shivam-nagar23 Feb 23, 2025
06819c4
oss sync
Shivam-nagar23 Feb 23, 2025
f5c61e9
user services chnages
Shivam-nagar23 Feb 23, 2025
1f41460
oss refactoing
Shivam-nagar23 Feb 23, 2025
4d4a835
token
Shivam-nagar23 Feb 23, 2025
42b6dee
subaction
Shivam-nagar23 Feb 23, 2025
f04bf91
oss ent sync
Shivam-nagar23 Feb 23, 2025
9da2876
update oss sync
Shivam-nagar23 Feb 23, 2025
c41bbe5
oss sync
Shivam-nagar23 Feb 23, 2025
2234c63
user service
Shivam-nagar23 Feb 23, 2025
c2fb678
user service
Shivam-nagar23 Feb 23, 2025
67b19e5
user response
Shivam-nagar23 Feb 23, 2025
34d2060
sync
Shivam-nagar23 Feb 23, 2025
a74eb7a
approver
Shivam-nagar23 Feb 23, 2025
9e2ee91
oss ent sync
Shivam-nagar23 Feb 23, 2025
e08ad15
oss
Shivam-nagar23 Feb 23, 2025
5059299
user service
Shivam-nagar23 Feb 24, 2025
84cf514
review comments
Shivam-nagar23 Feb 24, 2025
6fb8fbf
Merge pull request #6414 from devtron-labs/feat-access-manager-oss-en…
Shivam-nagar23 Feb 24, 2025
53f94cd
Merge branch 'develop' into feat-access-manager
Shivam-nagar23 Feb 24, 2025
05a1ae5
sql script chnage
Shivam-nagar23 Feb 24, 2025
3422fad
get flow
Shivam-nagar23 Feb 24, 2025
f38e973
nul data in case of unauthroised
Shivam-nagar23 Feb 25, 2025
30b758a
user admin
Shivam-nagar23 Feb 28, 2025
4489227
Merge branch 'develop' into feat-access-manager
Shivam-nagar23 Feb 28, 2025
c873624
get group policy
Shivam-nagar23 Mar 3, 2025
cf9b997
Merge branch 'develop' into feat-access-manager
Shivam-nagar23 Mar 3, 2025
0a48005
naming
Shivam-nagar23 Mar 3, 2025
ed1488e
sql scripts
Shivam-nagar23 Mar 7, 2025
915d1e0
Merge branch 'develop' into feat-access-manager
Shivam-nagar23 Mar 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ import (
"github.com/devtron-labs/devtron/api/sse"
"github.com/devtron-labs/devtron/api/team"
"github.com/devtron-labs/devtron/api/terminal"
"github.com/devtron-labs/devtron/api/userResource"
util5 "github.com/devtron-labs/devtron/api/util"
webhookHelm "github.com/devtron-labs/devtron/api/webhook/helm"
"github.com/devtron-labs/devtron/cel"
Expand Down Expand Up @@ -170,6 +171,7 @@ import (
workflow3 "github.com/devtron-labs/devtron/pkg/workflow"
"github.com/devtron-labs/devtron/pkg/workflow/dag"
util2 "github.com/devtron-labs/devtron/util"
"github.com/devtron-labs/devtron/util/commonEnforcementFunctionsUtil"
cron2 "github.com/devtron-labs/devtron/util/cron"
"github.com/devtron-labs/devtron/util/rbac"
"github.com/google/wire"
Expand Down Expand Up @@ -213,6 +215,7 @@ func InitializeApp() (*App, error) {
workflow3.WorkflowWireSet,
imageTagging.WireSet,
devtronResource.DevtronResourceWireSet,
userResource.UserResourceWireSet,
policyGovernance.PolicyGovernanceWireSet,
resourceScan.ScanningResultWireSet,

Expand Down Expand Up @@ -502,6 +505,9 @@ func InitializeApp() (*App, error) {
rbac.NewEnforcerUtilImpl,
wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),

commonEnforcementFunctionsUtil.NewCommonEnforcementUtilImpl,
wire.Bind(new(commonEnforcementFunctionsUtil.CommonEnforcementUtil), new(*commonEnforcementFunctionsUtil.CommonEnforcementUtilImpl)),

chartConfig.NewPipelineConfigRepository,
wire.Bind(new(chartConfig.PipelineConfigRepository), new(*chartConfig.PipelineConfigRepositoryImpl)),

Expand Down
2 changes: 1 addition & 1 deletion api/appStore/chartGroup/ChartGroupRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func (impl *ChartGroupRestHandlerImpl) GetChartGroupList(w http.ResponseWriter,
return
}
}
res, err := impl.ChartGroupService.ChartGroupList(maxCount)
res, err := impl.ChartGroupService.GetChartGroupList(maxCount)
if err != nil {
impl.Logger.Errorw("service err, GetChartGroupList", "err", err, "max", max)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down
2 changes: 1 addition & 1 deletion api/auth/sso/SsoLoginHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package sso
import (
"encoding/json"
"errors"
"github.com/devtron-labs/devtron/pkg/auth/user/bean"
"net/http"
"strconv"

"github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/api/restHandler/common"
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
"github.com/devtron-labs/devtron/pkg/auth/sso"
Expand Down
10 changes: 6 additions & 4 deletions api/auth/user/UserAuthHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package user
import (
"encoding/json"
"fmt"
bean2 "github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin/bean"
bean3 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
"net/http"
"strings"

Expand Down Expand Up @@ -146,7 +148,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
//for START in Casbin Object Ends Here
//loading policy for safety
casbin.LoadPolicy()
var policies []casbin.Policy
var policies []bean2.Policy
var policiesAdmin bean.PolicyRequest
err := json.Unmarshal([]byte(adminPolicies), &policiesAdmin)
if err != nil {
Expand Down Expand Up @@ -193,7 +195,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
roleView = strings.ReplaceAll(roleView, "<ENV>", env)
roleView = strings.ReplaceAll(roleView, "<APP>", app)

var roleAdminData bean.RoleData
var roleAdminData bean3.RoleData
err = json.Unmarshal([]byte(roleAdmin), &roleAdminData)
if err != nil {
handler.logger.Errorw("request err, AddDefaultPolicyAndRoles", "err", err, "payload", roleAdminData)
Expand All @@ -207,7 +209,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
return
}

var roleTriggerData bean.RoleData
var roleTriggerData bean3.RoleData
err = json.Unmarshal([]byte(roleTrigger), &roleTriggerData)
if err != nil {
handler.logger.Errorw("request err, AddDefaultPolicyAndRoles", "err", err, "payload", roleTriggerData)
Expand All @@ -221,7 +223,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
return
}

var roleViewData bean.RoleData
var roleViewData bean3.RoleData
err = json.Unmarshal([]byte(roleView), &roleViewData)
if err != nil {
handler.logger.Errorw("request err, AddDefaultPolicyAndRoles", "err", err, "payload", roleViewData)
Expand Down
Loading