kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix admin session

This commit is contained in:
Qian Wang 2019-08-03 22:42:26 +01:00
parent 9fa37e327f
commit 550c298bc2
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
cmd/ck-server/ck-server.go
View File

@ -78,17 +78,6 @@ func dispatchConnection(conn net.Conn, sta *server.State) {
return return
} }
user, err := sta.Panel.GetUser(UID)
if err != nil {
log.WithFields(log.Fields{
"UID": b64(UID),
"remoteAddr": remoteAddr,
"error": err,
}).Warn("+1 unauthorised UID")
goWeb()
return
}
finishHandshake := func(sessionKey []byte) error { finishHandshake := func(sessionKey []byte) error {
reply := server.ComposeReply(ch, sharedSecret, sessionKey) reply := server.ComposeReply(ch, sharedSecret, sessionKey)
_, err = conn.Write(reply) _, err = conn.Write(reply)
@ -107,6 +96,37 @@ func dispatchConnection(conn net.Conn, sta *server.State) {
goWeb() goWeb()
} }
// adminUID can use the server as normal with unlimited QoS credits. The adminUID is not
// added to the userinfo database. The distinction between going into the admin mode
// and normal proxy mode is that sessionID needs == 0 for admin mode
if bytes.Equal(UID, sta.AdminUID) && sessionID == 0 {
err = finishHandshake(sessionKey)
if err != nil {
log.Error(err)
return
}
sesh := mux.MakeSession(0, mux.UNLIMITED_VALVE, obfuscator, util.ReadTLS)
sesh.AddConnection(conn)
//TODO: Router could be nil in cnc mode
log.WithField("remoteAddr", conn.RemoteAddr()).Info("New admin session")
err = http.Serve(sesh, sta.LocalAPIRouter)
if err != nil {
log.Error(err)
return
}
}
user, err := sta.Panel.GetUser(UID)
if err != nil {
log.WithFields(log.Fields{
"UID": b64(UID),
"remoteAddr": remoteAddr,
"error": err,
}).Warn("+1 unauthorised UID")
goWeb()
return
}
sesh, existing, err := user.GetSession(sessionID, obfuscator, util.ReadTLS) sesh, existing, err := user.GetSession(sessionID, obfuscator, util.ReadTLS)
if err != nil { if err != nil {
user.DelSession(sessionID) user.DelSession(sessionID)
@ -124,25 +144,6 @@ func dispatchConnection(conn net.Conn, sta *server.State) {
return return
} }
// adminUID can use the server as normal with unlimited QoS credits. The adminUID is not
// added to the userinfo database. The distinction between going into the admin mode
// and normal proxy mode is that sessionID needs == 0 for admin mode
if bytes.Equal(UID, sta.AdminUID) && sessionID == 0 {
err = finishHandshake(sessionKey)
if err != nil {
log.Error(err)
return
}
sesh := mux.MakeSession(0, mux.UNLIMITED_VALVE, obfuscator, util.ReadTLS)
sesh.AddConnection(conn)
//TODO: Router could be nil in cnc mode
err = http.Serve(sesh, sta.LocalAPIRouter)
if err != nil {
log.Error(err)
return
}
}
err = finishHandshake(sessionKey) err = finishHandshake(sessionKey)
if err != nil { if err != nil {
log.Error(err) log.Error(err)