OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

online state

Browse Source
This commit is contained in:
simonzhangsz
2023-10-08 15:40:31 +08:00
parent 57659de7a2
commit 0a2ee6cb70
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
features/cm/ne.go
View File

@@ -771,7 +771,7 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
// neInfo := new(dborm.NeInfo) // neInfo := new(dborm.NeInfo)
neInfo, err := dborm.XormGetNeInfo(neType, neId) neInfo, err := dborm.XormGetNeInfo(neType, neId)
if err != nil { if err != nil {
log.Errorf("Failed to get ne_info:", err) log.Error("Failed to get ne_info:", err)
services.ResponseInternalServerError500DatabaseOperationFailed(w) services.ResponseInternalServerError500DatabaseOperationFailed(w)
return return
} }
@@ -785,7 +785,7 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
log.Debugf("Exec output: %v", string(out)) log.Debugf("Exec output: %v", string(out))
if err != nil { if err != nil {
log.Error("Faile to execute ssh %s omc:", action, err) log.Errorf("Faile to execute ssh %s omc:%v", action, err)
services.ResponseInternalServerError500ProcessError(w, err) services.ResponseInternalServerError500ProcessError(w, err)
return return
} }
@@ -797,7 +797,7 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
log.Debugf("Exec output: %v", string(out)) log.Debugf("Exec output: %v", string(out))
if err != nil { if err != nil {
log.Error("Faile to execute ssh sudo ims-%s command:", action, err) log.Errorf("Faile to execute %s command:%v", actionCmd, err)
services.ResponseInternalServerError500ProcessError(w, err) services.ResponseInternalServerError500ProcessError(w, err)
return return
} }
@@ -807,13 +807,13 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
log.Debugf("Exec output: %v", string(out)) log.Debugf("Exec output: %v", string(out))
if err != nil { if err != nil {
log.Error("Faile to execute ssh sudo ims-%s command:", action, err) log.Errorf("Faile to execute %s command:%v", actionCmd, err)
services.ResponseInternalServerError500ProcessError(w, err) services.ResponseInternalServerError500ProcessError(w, err)
return return
} }
default: default:
err = global.ErrCMUnknownServiceAction err = global.ErrCMUnknownServiceAction
log.Error("%v, action:%s", err, action) log.Errorf("%v, action:%s", err, action)
services.ResponseInternalServerError500ProcessError(w, err) services.ResponseInternalServerError500ProcessError(w, err)
return return
} }
@@ -823,11 +823,10 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
log.Debugf("Exec output: %v", string(out)) log.Debugf("Exec output: %v", string(out))
if err != nil { if err != nil {
log.Error("Faile to execute ssh sudo systemctl command:", err) log.Error("Faile to execute command:", err)
services.ResponseInternalServerError500ProcessError(w, err) services.ResponseInternalServerError500ProcessError(w, err)
return return
} }
} }
services.ResponseStatusOK204NoContent(w) services.ResponseStatusOK204NoContent(w)
@@ -898,7 +897,7 @@ func PostNeInstanceAction(w http.ResponseWriter, r *http.Request) {
} }
default: default:
err = global.ErrCMUnknownInstanceAction err = global.ErrCMUnknownInstanceAction
log.Error("%v, action:%s", err, action) log.Errorf("%v, action:%s", err, action)
services.ResponseInternalServerError500ProcessError(w, err) services.ResponseInternalServerError500ProcessError(w, err)
return return
} }

11
features/security/account.go
View File

@@ -7,6 +7,7 @@ import (
"io" "io"
"net/http" "net/http"
"strconv" "strconv"
"strings"
"time" "time"
"ems.agt/features/security/service" "ems.agt/features/security/service"
@@ -118,7 +119,7 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
} }
token := oauth.GenRandToken("omc") // Generate new token to session ID token := oauth.GenRandToken("omc") // Generate new token to session ID
sourceAddr := r.RemoteAddr sourceAddr := r.RemoteAddr[:strings.Index(r.RemoteAddr, ":")]
affected, err := dborm.XormInsertSession(oAuthBody.UserName, sourceAddr, token, affected, err := dborm.XormInsertSession(oAuthBody.UserName, sourceAddr, token,
config.GetExpiresFromConfig(), config.GetYamlConfig().Auth.Session) config.GetExpiresFromConfig(), config.GetYamlConfig().Auth.Session)
if err != nil { if err != nil {
@@ -185,7 +186,6 @@ func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
// 清除缓存用户信息 // 清除缓存用户信息
account.ClearLoginUser(se.AccountId) account.ClearLoginUser(se.AccountId)
services.ResponseStatusOK200Null(w) services.ResponseStatusOK200Null(w)
return
} }
func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) { func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) {
@@ -208,7 +208,7 @@ func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) {
// error processing ... // error processing ...
// 401-1 response // 401-1 response
token, ret := oauth.IsCarriedToken(r) token, ret := oauth.IsCarriedToken(r)
if ret == false { if !ret {
log.Error("AccessToken is not carried") log.Error("AccessToken is not carried")
services.ResponseUnauthorized401AccessTokenNotCarried(w) services.ResponseUnauthorized401AccessTokenNotCarried(w)
return return
@@ -221,14 +221,13 @@ func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) {
return return
} }
services.ResponseStatusOK200Null(w) services.ResponseStatusOK200Null(w)
return
} }
// 系统登录 // 系统登录
// //
// POST /login // POST /login
func LoginOMC(w http.ResponseWriter, r *http.Request) { func LoginOMC(w http.ResponseWriter, r *http.Request) {
log.Info("LoginFromOMC processing... ") log.Info("LoginOMC processing... ")
var body struct { var body struct {
Username string `json:"username" binding:"required"` // Username 用户名 Username string `json:"username" binding:"required"` // Username 用户名
Password string `json:"password" binding:"required"` // Password 用户密码 Password string `json:"password" binding:"required"` // Password 用户密码
@@ -285,7 +284,7 @@ func LoginOMC(w http.ResponseWriter, r *http.Request) {
} }
token := oauth.GenRandToken("omc") // Generate new token to session ID token := oauth.GenRandToken("omc") // Generate new token to session ID
sourceAddr := r.RemoteAddr sourceAddr := r.RemoteAddr[:strings.Index(r.RemoteAddr, ":")]
affected, err := dborm.XormInsertSession(body.Username, sourceAddr, token, affected, err := dborm.XormInsertSession(body.Username, sourceAddr, token,
config.GetExpiresFromConfig(), config.GetYamlConfig().Auth.Session) config.GetExpiresFromConfig(), config.GetYamlConfig().Auth.Session)
if err != nil { if err != nil {