evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善资源隔离和授权管理

Browse Source
This commit is contained in:
dushixiang
2021-01-16 17:29:20 +08:00
parent 44110722b2
commit 11c1ac23e4
16 changed files with 120 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/asset.go
View File

@ -51,7 +51,7 @@ func FindAllAsset() (o []Asset, err error) {
func FindAssetByConditions(protocol string, account User) (o []Asset, err error) {
db := global.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created, users.nickname as owner_name,COUNT(resources.user_id) as sharer_count").Joins("left join users on assets.owner = users.id").Joins("left join resources on assets.id = resources.resource_id").Group("assets.id")
if RoleUser == account.Role {
if TypeUser == account.Type {
owner := account.ID
db = db.Where("assets.owner = ? or resources.user_id = ?", owner, owner)
}
@ -67,7 +67,7 @@ func FindPageAsset(pageIndex, pageSize int, name, protocol, tags string, account
db := global.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created, users.nickname as owner_name,COUNT(resources.user_id) as sharer_count").Joins("left join users on assets.owner = users.id").Joins("left join resources on assets.id = resources.resource_id").Group("assets.id")
dbCounter := global.DB.Table("assets").Select("DISTINCT assets.id").Joins("left join resources on assets.id = resources.resource_id")
if RoleUser == account.Role {
if TypeUser == account.Type {
owner := account.ID
db = db.Where("assets.owner = ? or resources.user_id = ?", owner, owner)
dbCounter = dbCounter.Where("assets.owner = ? or resources.user_id = ?", owner, owner)

2
pkg/model/command.go
View File

@ -32,7 +32,7 @@ func FindPageCommand(pageIndex, pageSize int, name, content string, account User
db := global.DB.Table("commands").Select("commands.id,commands.name,commands.content,commands.owner,commands.created, users.nickname as owner_name,COUNT(resources.user_id) as sharer_count").Joins("left join users on commands.owner = users.id").Joins("left join resources on commands.id = resources.resource_id").Group("commands.id")
dbCounter := global.DB.Table("commands").Select("DISTINCT commands.id").Joins("left join resources on commands.id = resources.resource_id")
if RoleUser == account.Role {
if TypeUser == account.Type {
owner := account.ID
db = db.Where("commands.owner = ? or resources.user_id = ?", owner, owner)
dbCounter = dbCounter.Where("commands.owner = ? or resources.user_id = ?", owner, owner)

4
pkg/model/credential.go
View File

@ -45,7 +45,7 @@ type CredentialSimpleVo struct {
func FindAllCredential(account User) (o []CredentialSimpleVo, err error) {
db := global.DB.Table("credentials").Select("DISTINCT credentials.id,credentials.name").Joins("left join resources on credentials.id = resources.resource_id")
if account.Role == RoleUser {
if account.Type == TypeUser {
db = db.Where("credentials.owner = ? or resources.user_id = ?", account.ID, account.ID)
}
err = db.Find(&o).Error
@ -56,7 +56,7 @@ func FindPageCredential(pageIndex, pageSize int, name string, account User) (o [
db := global.DB.Table("credentials").Select("credentials.id,credentials.name,credentials.type,credentials.username,credentials.owner,credentials.created,users.nickname as owner_name,COUNT(resources.user_id) as sharer_count").Joins("left join users on credentials.owner = users.id").Joins("left join resources on credentials.id = resources.resource_id").Group("credentials.id")
dbCounter := global.DB.Table("credentials").Select("DISTINCT credentials.id").Joins("left join resources on credentials.id = resources.resource_id")
if RoleUser == account.Role {
if TypeUser == account.Type {
owner := account.ID
db = db.Where("credentials.owner = ? or resources.user_id = ?", owner, owner)
dbCounter = dbCounter.Where("credentials.owner = ? or resources.user_id = ?", owner, owner)

6
pkg/model/user.go
View File

@ -7,8 +7,8 @@ import (
)
const (
RoleUser = "user"
RoleAdmin = "admin"
TypeUser = "user"
TypeAdmin = "admin"
)
type User struct {
@ -20,7 +20,7 @@ type User struct {
Online bool `json:"online"`
Enabled bool `json:"enabled"`
Created utils.JsonTime `json:"created"`
Role string `json:"role"`
Type string `json:"type"`
}
func (r *User) TableName() string {