Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
K
koko
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
koko
Commits
1cbc95dd
Commit
1cbc95dd
authored
6 years ago
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:LeeEirc/cocogo
parents
e91d39a6
26569a86
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
183 additions
and
107 deletions
+183
-107
server.go
pkg/auth/server.go
+1
-1
client.go
pkg/common/client.go
+4
-2
terminal.go
pkg/model/terminal.go
+34
-0
accesskey.go
pkg/service/accesskey.go
+3
-3
assets.go
pkg/service/assets.go
+4
-3
client.go
pkg/service/client.go
+0
-86
init.go
pkg/service/init.go
+24
-1
terminal.go
pkg/service/terminal.go
+75
-7
urls.go
pkg/service/urls.go
+5
-0
users.go
pkg/service/users.go
+33
-4
No files found.
pkg/auth/server.go
View file @
1cbc95dd
...
@@ -21,7 +21,7 @@ func checkAuth(ctx ssh.Context, password, publicKey string) (ok bool) {
...
@@ -21,7 +21,7 @@ func checkAuth(ctx ssh.Context, password, publicKey string) (ok bool) {
if
password
!=
""
{
if
password
!=
""
{
authMethod
=
"password"
authMethod
=
"password"
}
}
if
user
==
nil
{
if
user
.
Id
==
""
{
action
=
"Failed"
action
=
"Failed"
}
else
{
}
else
{
ctx
.
SetValue
(
cctx
.
ContextKeyUser
,
user
)
ctx
.
SetValue
(
cctx
.
ContextKeyUser
,
user
)
...
...
This diff is collapsed.
Click to expand it.
pkg/common/client.go
View file @
1cbc95dd
...
@@ -15,7 +15,7 @@ import (
...
@@ -15,7 +15,7 @@ import (
)
)
type
ClientAuth
interface
{
type
ClientAuth
interface
{
Sign
()
string
Sign
()
(
date
,
sign
string
)
}
}
type
Client
struct
{
type
Client
struct
{
...
@@ -97,7 +97,9 @@ func (c *Client) SetAuthHeader(r *http.Request, params ...map[string]string) {
...
@@ -97,7 +97,9 @@ func (c *Client) SetAuthHeader(r *http.Request, params ...map[string]string) {
return
return
}
}
if
c
.
Auth
!=
nil
{
if
c
.
Auth
!=
nil
{
r
.
Header
.
Set
(
"Authorization"
,
c
.
Auth
.
Sign
())
date
,
sign
:=
c
.
Auth
.
Sign
()
r
.
Header
.
Set
(
"Date"
,
date
)
r
.
Header
.
Set
(
"Authorization"
,
sign
)
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
pkg/model/terminal.go
0 → 100644
View file @
1cbc95dd
package
model
type
Terminal
struct
{
Name
string
`json:"name"`
Comment
string
`json:"comment"`
ServiceAccount
struct
{
Id
string
`json:"id"`
Name
string
`json:"name"`
AccessKey
struct
{
Id
string
`json:"id"`
Secret
string
`json:"secret"`
}
}
`json:"service_account"`
}
type
TerminalConf
struct
{
AssetListPageSize
string
`json:"TERMINAL_ASSET_LIST_PAGE_SIZE"`
AssetListSortBy
string
`json:"TERMINAL_ASSET_LIST_SORT_BY"`
HeaderTitle
string
`json:"TERMINAL_HEADER_TITLE"`
HostKey
string
`json:"TERMINAL_HOST_KEY" yaml:"HOST_KEY"`
PasswordAuth
bool
`json:"TERMINAL_PASSWORD_AUTH" yaml:"PASSWORD_AUTH"`
PublicKeyAuth
bool
`json:"TERMINAL_PUBLIC_KEY_AUTH" yaml:"PUBLIC_KEY_AUTH"`
CommandStorage
map
[
string
]
string
`json:"TERMINAL_COMMAND_STORAGE"`
ReplayStorage
map
[
string
]
string
`json:"TERMINAL_REPLAY_STORAGE" yaml:"REPLAY_STORAGE"`
SessionKeepDuration
int
`json:"TERMINAL_SESSION_KEEP_DURATION"`
TelnetRegex
string
`json:"TERMINAL_TELNET_REGEX"`
}
type
TerminalTask
struct
{
Id
string
`json:"id"`
Name
string
`json:"name"`
Args
string
`json:"args"`
IsFinished
bool
}
This diff is collapsed.
Click to expand it.
pkg/service/accesskey.go
View file @
1cbc95dd
...
@@ -24,10 +24,10 @@ type AccessKey struct {
...
@@ -24,10 +24,10 @@ type AccessKey struct {
Value
string
Value
string
}
}
func
(
ak
AccessKey
)
Sign
()
string
{
func
(
ak
AccessKey
)
Sign
()
(
string
,
string
)
{
date
:=
common
.
HTTPGMTDate
()
date
:=
common
.
HTTPGMTDate
()
signature
:=
common
.
MakeSignature
(
ak
.
Secret
,
date
)
signature
:=
common
.
MakeSignature
(
ak
.
Secret
,
date
)
return
fmt
.
Sprintf
(
"Sign %s:%s"
,
ak
.
Id
,
signature
)
return
date
,
fmt
.
Sprintf
(
"Sign %s:%s"
,
ak
.
Id
,
signature
)
}
}
func
(
ak
*
AccessKey
)
LoadAccessKeyFromStr
(
key
string
)
error
{
func
(
ak
*
AccessKey
)
LoadAccessKeyFromStr
(
key
string
)
error
{
...
@@ -35,7 +35,7 @@ func (ak *AccessKey) LoadAccessKeyFromStr(key string) error {
...
@@ -35,7 +35,7 @@ func (ak *AccessKey) LoadAccessKeyFromStr(key string) error {
return
AccessKeyNotFound
return
AccessKeyNotFound
}
}
keySlice
:=
strings
.
Split
(
strings
.
TrimSpace
(
key
),
":"
)
keySlice
:=
strings
.
Split
(
strings
.
TrimSpace
(
key
),
":"
)
if
len
(
ak
.
Valu
e
)
!=
2
{
if
len
(
keySlic
e
)
!=
2
{
return
AccessKeyInvalid
return
AccessKeyInvalid
}
}
ak
.
Id
=
keySlice
[
0
]
ak
.
Id
=
keySlice
[
0
]
...
...
This diff is collapsed.
Click to expand it.
pkg/service/assets.go
View file @
1cbc95dd
package
service
package
service
import
(
import
(
"cocogo/pkg/logger"
"cocogo/pkg/model"
"encoding/json"
"encoding/json"
"fmt"
"fmt"
"cocogo/pkg/logger"
"cocogo/pkg/model"
)
)
func
GetSystemUserAssetAuthInfo
(
systemUserID
,
assetID
string
)
(
info
model
.
SystemUserAuthInfo
)
{
func
GetSystemUserAssetAuthInfo
(
systemUserID
,
assetID
string
)
(
info
model
.
SystemUserAuthInfo
)
{
...
@@ -14,7 +15,7 @@ func GetSystemUserAssetAuthInfo(systemUserID, assetID string) (info model.System
...
@@ -14,7 +15,7 @@ func GetSystemUserAssetAuthInfo(systemUserID, assetID string) (info model.System
func
GetSystemUserAuthInfo
(
systemUserID
string
)
(
info
model
.
SystemUserAuthInfo
)
{
func
GetSystemUserAuthInfo
(
systemUserID
string
)
(
info
model
.
SystemUserAuthInfo
)
{
Url
:=
fmt
.
Sprintf
(
SystemUserAuthInfoURL
,
systemUserID
)
Url
:=
fmt
.
Sprintf
(
SystemUserAuthInfoURL
,
systemUserID
)
err
:=
client
.
Get
(
Url
,
&
info
,
true
)
err
:=
authClient
.
Get
(
Url
,
&
info
)
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
Error
(
"Get system user auth info failed"
)
logger
.
Error
(
"Get system user auth info failed"
)
}
}
...
...
This diff is collapsed.
Click to expand it.
pkg/service/client.go
deleted
100644 → 0
View file @
e91d39a6
package
service
import
(
"path"
"path/filepath"
"cocogo/pkg/common"
"cocogo/pkg/config"
"cocogo/pkg/model"
)
type
ClientAuth
interface
{
Sign
()
string
}
type
WrapperClient
struct
{
Http
*
common
.
Client
AuthClient
*
common
.
Client
Auth
ClientAuth
BaseHost
string
}
func
(
c
*
WrapperClient
)
LoadAuth
()
error
{
keyPath
:=
config
.
Conf
.
AccessKeyFile
if
!
path
.
IsAbs
(
config
.
Conf
.
AccessKeyFile
)
{
keyPath
=
filepath
.
Join
(
config
.
Conf
.
RootPath
,
keyPath
)
}
ak
:=
AccessKey
{
Value
:
config
.
Conf
.
AccessKey
,
Path
:
keyPath
}
err
:=
ak
.
Load
()
if
err
!=
nil
{
return
err
}
c
.
Auth
=
ak
return
nil
}
func
(
c
*
WrapperClient
)
CheckAuth
()
error
{
var
user
model
.
User
err
:=
c
.
Http
.
Get
(
"UserProfileUrl"
,
&
user
)
if
err
!=
nil
{
return
err
}
return
nil
}
func
(
c
*
WrapperClient
)
Get
(
url
string
,
res
interface
{},
needAuth
bool
)
error
{
if
needAuth
{
return
c
.
AuthClient
.
Get
(
c
.
BaseHost
+
url
,
res
)
}
else
{
return
c
.
Http
.
Get
(
c
.
BaseHost
+
url
,
res
)
}
}
func
(
c
*
WrapperClient
)
Post
(
url
string
,
data
interface
{},
res
interface
{},
needAuth
bool
)
error
{
if
needAuth
{
return
c
.
AuthClient
.
Post
(
url
,
data
,
res
)
}
else
{
return
c
.
Http
.
Post
(
url
,
data
,
res
)
}
}
func
(
c
*
WrapperClient
)
Delete
(
url
string
,
res
interface
{},
needAuth
bool
)
error
{
if
needAuth
{
return
c
.
AuthClient
.
Delete
(
url
,
res
)
}
else
{
return
c
.
Http
.
Delete
(
url
,
res
)
}
}
func
(
c
*
WrapperClient
)
Put
(
url
string
,
data
interface
{},
res
interface
{},
needAuth
bool
)
error
{
if
needAuth
{
return
c
.
AuthClient
.
Put
(
url
,
data
,
res
)
}
else
{
return
c
.
Http
.
Put
(
url
,
data
,
res
)
}
}
func
(
c
*
WrapperClient
)
Patch
(
url
string
,
data
interface
{},
res
interface
{},
needAuth
bool
)
error
{
if
needAuth
{
return
c
.
AuthClient
.
Patch
(
url
,
data
,
res
)
}
else
{
return
c
.
Http
.
Patch
(
url
,
data
,
res
)
}
}
This diff is collapsed.
Click to expand it.
pkg/service/init.go
View file @
1cbc95dd
package
service
package
service
var
client
=
WrapperClient
{}
import
(
"path"
"path/filepath"
"strings"
"cocogo/pkg/common"
"cocogo/pkg/config"
)
var
client
=
common
.
NewClient
(
10
)
var
authClient
=
common
.
NewClient
(
10
)
var
baseHost
string
func
Initial
()
{
keyPath
:=
config
.
Conf
.
AccessKeyFile
baseHost
=
strings
.
TrimRight
(
config
.
Conf
.
CoreHost
,
"/"
)
if
!
path
.
IsAbs
(
config
.
Conf
.
AccessKeyFile
)
{
keyPath
=
filepath
.
Join
(
config
.
Conf
.
RootPath
,
keyPath
)
}
ak
:=
AccessKey
{
Value
:
config
.
Conf
.
AccessKey
,
Path
:
keyPath
}
_
=
ak
.
Load
()
authClient
.
Auth
=
ak
}
This diff is collapsed.
Click to expand it.
pkg/service/terminal.go
View file @
1cbc95dd
package
service
package
service
func
registerTerminal
(
name
string
)
{
import
(
"fmt"
}
"cocogo/pkg/logger"
"cocogo/pkg/model"
)
func
CreateServiceAccount
()
{
func
RegisterTerminal
(
name
,
token
,
comment
string
)
(
res
model
.
Terminal
)
{
if
client
.
Headers
==
nil
{
client
.
Headers
=
make
(
map
[
string
]
string
)
}
client
.
Headers
[
"Authorization"
]
=
fmt
.
Sprintf
(
"BootstrapToken %s"
,
token
)
data
:=
map
[
string
]
string
{
"name"
:
name
,
"comment"
:
comment
}
err
:=
client
.
Post
(
baseHost
+
TerminalRegisterURL
,
data
,
&
res
)
if
err
!=
nil
{
logger
.
Error
(
err
)
}
return
}
}
func
CreateSession
(
)
{
func
TerminalHeartBeat
(
sIds
[]
string
)
(
res
[]
model
.
TerminalTask
)
{
data
:=
map
[
string
][]
string
{
"sessions"
:
sIds
,
}
err
:=
authClient
.
Post
(
baseHost
+
TerminalHeartBeatURL
,
data
,
&
res
)
if
err
!=
nil
{
logger
.
Error
(
err
)
}
return
}
}
func
FinishSession
()
{
func
CreateSession
(
data
map
[
string
]
interface
{})
bool
{
var
res
map
[
string
]
interface
{}
err
:=
authClient
.
Post
(
baseHost
+
SessionListURL
,
data
,
&
res
)
if
err
==
nil
{
return
true
}
logger
.
Error
(
err
)
return
false
}
func
FinishSession
(
sid
,
dataEnd
string
)
{
var
res
map
[
string
]
interface
{}
data
:=
map
[
string
]
interface
{}{
"is_finished"
:
true
,
"date_end"
:
dataEnd
,
}
Url
:=
fmt
.
Sprintf
(
baseHost
+
SessionDetailURL
,
sid
)
err
:=
authClient
.
Patch
(
Url
,
data
,
&
res
)
if
err
!=
nil
{
logger
.
Error
(
err
)
}
}
}
func
PushSessionReplay
(
sessionID
,
gZipFile
string
)
{
func
FinishReply
(
sid
string
)
bool
{
var
res
map
[
string
]
interface
{}
data
:=
map
[
string
]
bool
{
"has_replay"
:
true
}
Url
:=
fmt
.
Sprintf
(
baseHost
+
SessionDetailURL
,
sid
)
err
:=
authClient
.
Patch
(
Url
,
data
,
&
res
)
if
err
!=
nil
{
logger
.
Error
(
err
)
return
false
}
return
true
}
func
FinishTask
(
tid
string
)
bool
{
var
res
map
[
string
]
interface
{}
data
:=
map
[
string
]
bool
{
"is_finished"
:
true
}
Url
:=
fmt
.
Sprintf
(
baseHost
+
FinishTaskURL
,
tid
)
err
:=
authClient
.
Patch
(
Url
,
data
,
res
)
if
err
!=
nil
{
logger
.
Error
(
err
)
return
false
}
return
true
}
}
func
FinishReply
()
{
func
LoadConfigFromServer
()
(
res
model
.
TerminalConf
)
{
err
:=
authClient
.
Get
(
baseHost
+
TerminalConfigURL
,
&
res
)
if
err
!=
nil
{
logger
.
Error
(
err
)
}
return
}
func
PushSessionReplay
(
sessionID
,
gZipFile
string
)
{
}
}
This diff is collapsed.
Click to expand it.
pkg/service/urls.go
View file @
1cbc95dd
...
@@ -3,16 +3,21 @@ package service
...
@@ -3,16 +3,21 @@ package service
const
(
const
(
UserAuthURL
=
"/api/users/v1/auth/"
// post 验证用户登陆
UserAuthURL
=
"/api/users/v1/auth/"
// post 验证用户登陆
UserProfileURL
=
"/api/users/v1/profile/"
// 获取当前用户的基本信息
UserProfileURL
=
"/api/users/v1/profile/"
// 获取当前用户的基本信息
UserUserURL
=
"/api/users/v1/users/%s/"
// 获取用户信息
SystemUserAssetAuthURL
=
"/api/assets/v1/system-user/%s/asset/%s/auth-info/"
// 该系统用户对某资产的授权
SystemUserAssetAuthURL
=
"/api/assets/v1/system-user/%s/asset/%s/auth-info/"
// 该系统用户对某资产的授权
SystemUserAuthInfoURL
=
"/api/assets/v1/system-user/%s/auth-info/"
// 该系统用户的授权
SystemUserAuthInfoURL
=
"/api/assets/v1/system-user/%s/auth-info/"
// 该系统用户的授权
TerminalRegisterURL
=
"/api/terminal/v2/terminal-registrations/"
// 注册当前coco
TerminalRegisterURL
=
"/api/terminal/v2/terminal-registrations/"
// 注册当前coco
TerminalConfigURL
=
"/api/terminal/v1/terminal/config/"
// 从jumpserver获取coco的配置
TerminalConfigURL
=
"/api/terminal/v1/terminal/config/"
// 从jumpserver获取coco的配置
TerminalHeartBeatURL
=
"/api/terminal/v1/terminal/status/"
SessionListURL
=
"/api/terminal/v1/sessions/"
//上传创建的资产会话session id
SessionListURL
=
"/api/terminal/v1/sessions/"
//上传创建的资产会话session id
SessionDetailURL
=
"/api/terminal/v1/sessions/%s/"
// finish session的时候发送
SessionDetailURL
=
"/api/terminal/v1/sessions/%s/"
// finish session的时候发送
SessionReplayURL
=
"/api/terminal/v1/sessions/%s/replay/"
//上传录像
SessionReplayURL
=
"/api/terminal/v1/sessions/%s/replay/"
//上传录像
FinishTaskURL
=
"/api/terminal/v1/tasks/%s/"
UserAssetsURL
=
"/api/perms/v1/user/%s/assets/"
//获取用户授权的所有资产
UserAssetsURL
=
"/api/perms/v1/user/%s/assets/"
//获取用户授权的所有资产
UserNodesAssetsURL
=
"/api/perms/v1/user/%s/nodes-assets/"
// 获取用户授权的所有节点信息 节点分组
UserNodesAssetsURL
=
"/api/perms/v1/user/%s/nodes-assets/"
// 获取用户授权的所有节点信息 节点分组
ValidateUserAssetPermissionURL
=
"/api/perms/v1/asset-permission/user/validate/"
//0不使用缓存 1 使用缓存 2 刷新缓存
ValidateUserAssetPermissionURL
=
"/api/perms/v1/asset-permission/user/validate/"
//0不使用缓存 1 使用缓存 2 刷新缓存
...
...
This diff is collapsed.
Click to expand it.
pkg/service/users.go
View file @
1cbc95dd
package
service
package
service
import
(
import
(
"fmt"
"cocogo/pkg/logger"
"cocogo/pkg/model"
"cocogo/pkg/model"
)
)
func
Authenticate
(
username
,
password
,
publicKey
,
remoteAddr
,
loginType
string
)
*
model
.
User
{
func
Authenticate
(
username
,
password
,
publicKey
,
remoteAddr
,
loginType
string
)
(
user
model
.
User
)
{
return
&
model
.
User
{
Id
:
"1111111111"
,
Username
:
"admin"
,
Name
:
"广宏伟"
}
data
:=
map
[
string
]
string
{
"username"
:
username
,
"password"
:
password
,
"public_key"
:
publicKey
,
"remote_addr"
:
remoteAddr
,
"login_type"
:
loginType
}
var
resp
struct
{
Token
string
`json:"token"`
User
model
.
User
`json:"user"`
}
err
:=
client
.
Post
(
baseHost
+
UserAuthURL
,
data
,
&
resp
)
if
err
!=
nil
{
logger
.
Error
(
err
)
}
return
resp
.
User
}
}
func
GetUserProfile
(
userId
string
)
(
user
model
.
User
)
{
func
GetUserProfile
(
userId
string
)
(
user
model
.
User
)
{
Url
:=
fmt
.
Sprintf
(
baseHost
+
UserUserURL
,
userId
)
err
:=
authClient
.
Get
(
Url
,
&
user
)
if
err
!=
nil
{
logger
.
Error
(
err
)
}
return
return
}
}
func
LoadUserByUsername
(
user
*
model
.
User
)
{
func
CheckUserCookie
(
sessionId
,
csrfToken
string
)
(
user
model
.
User
)
{
client
.
SetCookie
(
"csrftoken"
,
csrfToken
)
client
.
SetCookie
(
"sessionid"
,
sessionId
)
err
:=
client
.
Get
(
baseHost
+
UserProfileURL
,
&
user
)
if
err
!=
nil
{
logger
.
Error
(
err
)
}
return
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment