From a1da184942f9c0817aa62ea52866d457e94e4a99 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 21 Mar 2024 12:13:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88=E5=86=85=E9=83=A8acce?= =?UTF-8?q?ssToken=E8=AF=B7=E6=B1=82=E5=A4=B4=EF=BC=8C=E7=A7=BB=E9=99=A4Ch?= =?UTF-8?q?eckFrontValidRequest=E6=A3=80=E6=9F=A5token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/cm/license.go | 40 ++++++------- features/cm/ne.go | 103 ++++++++++++++++----------------- features/cm/software.go | 74 ++++++++++++------------ features/dbrest/dbrest.go | 10 ++-- features/file/file.go | 36 ++++++------ features/fm/alarm.go | 12 ++-- features/pm/performance.go | 42 +++++++------- features/security/account.go | 24 ++++---- features/sm/backup.go | 10 ++-- features/state/getstate.go | 78 ++++++++++++------------- features/trace/trace.go | 40 ++++++------- features/ue/ue.go | 70 +++++++++++------------ lib/mmlp/parse.go | 10 ++-- lib/services/services.go | 108 +++++++++++++++++------------------ 14 files changed, 330 insertions(+), 327 deletions(-) diff --git a/features/cm/license.go b/features/cm/license.go index e2935d7..84785b5 100644 --- a/features/cm/license.go +++ b/features/cm/license.go @@ -29,11 +29,11 @@ var ( func UploadLicenseFile(w http.ResponseWriter, r *http.Request) { log.Debug("UploadLicenseFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -51,11 +51,11 @@ func UploadLicenseFile(w http.ResponseWriter, r *http.Request) { func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) { log.Debug("DownloadLicenseFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -97,11 +97,11 @@ func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) { func DeleteLcenseFile(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteLcenseFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -173,11 +173,11 @@ func init() { func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) { log.Info("UploadLicenseFileData processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] diff --git a/features/cm/ne.go b/features/cm/ne.go index 4adb24d..04708c0 100644 --- a/features/cm/ne.go +++ b/features/cm/ne.go @@ -70,11 +70,11 @@ func init() { func GetNeInfo(w http.ResponseWriter, r *http.Request) { log.Debug("GetNeInfo processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -112,11 +112,11 @@ type OmcNeConfig struct { func PostNeInfo(w http.ResponseWriter, r *http.Request) { log.Debug("PostNeInfo processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -226,11 +226,11 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) { func PutNeInfo(w http.ResponseWriter, r *http.Request) { log.Debug("PutNeInfo processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -337,11 +337,11 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) { func DeleteNeInfo(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteNeInfo processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -420,11 +420,11 @@ func IsActiveNF(neInfo *dborm.NeInfo) bool { func ExportCmFromNF(w http.ResponseWriter, r *http.Request) { log.Debug("ExportCmFromNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -561,11 +561,11 @@ type ImportCMJson struct { func ImportCmToNF(w http.ResponseWriter, r *http.Request) { log.Debug("ImportCmToNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -595,12 +595,13 @@ func ImportCmToNF(w http.ResponseWriter, r *http.Request) { path = config.GetYamlConfig().OMC.Backup } else { path = config.GetYamlConfig().OMC.Upload - fileName, err = services.HandleUploadFile(r, path, "") + fileNamePath, err := services.HandleUploadFile(r, path, "") if err != nil { log.Error("Faile to HandleUploadFile:", err) services.ResponseInternalServerError500ProcessError(w, err) return } + fileName = fileNamePath } filePath := fmt.Sprintf("%s/%s", path, fileName) @@ -722,11 +723,11 @@ func ImportCmToNF(w http.ResponseWriter, r *http.Request) { func DownloadNeBackupFile(w http.ResponseWriter, r *http.Request) { log.Debug("DownloadNeBackupFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -767,11 +768,11 @@ func DownloadNeBackupFile(w http.ResponseWriter, r *http.Request) { func DeleteNeBackupFile(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteNeBackupFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -826,11 +827,11 @@ func DeleteNeBackupFile(w http.ResponseWriter, r *http.Request) { func PostNeServiceAction(w http.ResponseWriter, r *http.Request) { log.Debug("PostNeServiceAction processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -912,11 +913,11 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) { func PostNeInstanceAction(w http.ResponseWriter, r *http.Request) { log.Debug("PostNeInstanceAction processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] diff --git a/features/cm/software.go b/features/cm/software.go index ad8d776..2347ab5 100644 --- a/features/cm/software.go +++ b/features/cm/software.go @@ -55,11 +55,11 @@ func verify_signature(public_key_name string, source_cms_file string, source_fil func UploadSoftwareFile(w http.ResponseWriter, r *http.Request) { log.Debug("UploadSoftwareFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -191,11 +191,11 @@ func UploadSoftwareFile(w http.ResponseWriter, r *http.Request) { func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) { log.Info("UploadSoftwareMultiFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -216,7 +216,7 @@ func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) { md5Param := services.GetUriParamString(r, "md5Sum", ",", false, false) softwarePath := fmt.Sprintf("%s/%s", config.GetYamlConfig().OMC.Software, neTypeLower) - err = os.MkdirAll(softwarePath, os.ModePerm) + err := os.MkdirAll(softwarePath, os.ModePerm) if err != nil { log.Error("Failed to Mkdir:", err) services.ResponseInternalServerError500ProcessError(w, err) @@ -314,7 +314,7 @@ func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) { result := verify_signature(config.GetYamlConfig().Auth.PublicKey, cmsFilePath, rpmFilePath) log.Debug("result:", result.String()) if !strings.Contains(result.String(), SoftwareVerifiedOk) { - err = global.ErrCMNotMatchSignFile + err := global.ErrCMNotMatchSignFile log.Error(err) services.ResponseInternalServerError500ProcessError(w, err) return @@ -372,11 +372,11 @@ func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) { func DownloadSoftwareFile(w http.ResponseWriter, r *http.Request) { log.Debug("DownloadSoftwareFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -418,11 +418,11 @@ func DownloadSoftwareFile(w http.ResponseWriter, r *http.Request) { func DeleteSoftwareFile(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteSoftwareFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -478,11 +478,11 @@ func DeleteSoftwareFile(w http.ResponseWriter, r *http.Request) { func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) { log.Debug("DistributeSoftwareFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -618,11 +618,11 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) { func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) { log.Debug("ActiveSoftwareToNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] @@ -825,11 +825,11 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) { func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) { log.Debug("ActiveSoftwareToNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] diff --git a/features/dbrest/dbrest.go b/features/dbrest/dbrest.go index c03f9b0..44fbd55 100644 --- a/features/dbrest/dbrest.go +++ b/features/dbrest/dbrest.go @@ -514,11 +514,11 @@ func DatabaseGetData(w http.ResponseWriter, r *http.Request) { var sql []string var err error - _, err = services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err = services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) tblName := vars["objectTypeValue"] diff --git a/features/file/file.go b/features/file/file.go index 8f65f8a..60f341c 100644 --- a/features/file/file.go +++ b/features/file/file.go @@ -38,11 +38,11 @@ var ( func UploadFile(w http.ResponseWriter, r *http.Request) { log.Debug("UploadFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } vars := mux.Vars(r) location := vars["location"] @@ -64,20 +64,22 @@ func UploadFile(w http.ResponseWriter, r *http.Request) { } if location == "upload" { path = config.GetYamlConfig().OMC.Upload - fileName, err = services.HandleUploadFile(r, path, fileName) + fileNamePath, err := services.HandleUploadFile(r, path, fileName) if err != nil { log.Error("Faile to HandleUploadFile:", err) services.ResponseInternalServerError500ProcessError(w, err) return } + fileName = fileNamePath } else { path = config.GetYamlConfig().OMC.FrontUpload - fileName, err = services.HandleUploadFile(r, path, fileName) + fileNamePath, err := services.HandleUploadFile(r, path, fileName) if err != nil { log.Error("Faile to HandleUploadFile:", err) services.ResponseInternalServerError500ProcessError(w, err) return } + fileName = fileNamePath } log.Debugf("upload file=%s to path=%s", fileName, path) @@ -88,11 +90,11 @@ func UploadFile(w http.ResponseWriter, r *http.Request) { func DownloadFile(w http.ResponseWriter, r *http.Request) { log.Debug("DownloadFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) location := vars["location"] @@ -133,11 +135,11 @@ func DownloadFile(w http.ResponseWriter, r *http.Request) { func DeleteFile(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteFile processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["neType"] diff --git a/features/fm/alarm.go b/features/fm/alarm.go index 43ae414..60aece3 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -507,11 +507,11 @@ func pushKafka(alarmData Alarm) { func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) { log.Debug("GetAlarmFromNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] neTypeLower := strings.ToLower(neType) @@ -525,7 +525,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) { //var neInfo *dborm.NeInfo var nes []dborm.NeInfo - _, err = dborm.XormGetAllNeInfo(&nes) + _, err := dborm.XormGetAllNeInfo(&nes) if err != nil { log.Error("Failed to get all ne info:", err) services.ResponseInternalServerError500ProcessError(w, err) diff --git a/features/pm/performance.go b/features/pm/performance.go index 72ac832..0db6892 100644 --- a/features/pm/performance.go +++ b/features/pm/performance.go @@ -414,11 +414,11 @@ func PostMeasureReportFromNF(w http.ResponseWriter, r *http.Request) { func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) { log.Debug("PostMeasureTaskToNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -590,11 +590,11 @@ func PutMeasureTaskToNF(w http.ResponseWriter, r *http.Request) { func DeleteMeasureTaskToNF(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteMeasureTaskToNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -721,11 +721,11 @@ func DeleteMeasureTaskToNF(w http.ResponseWriter, r *http.Request) { func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) { log.Debug("PatchMeasureTaskToNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) neType := vars["elementTypeValue"] @@ -917,11 +917,11 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) { func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) { log.Debug("GetMeasurementFromNF processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } vars := mux.Vars(r) apiVer := vars["apiVersion"] @@ -949,7 +949,7 @@ func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) { //var neInfo *dborm.NeInfo neInfo := new(dborm.NeInfo) - neInfo, err = dborm.XormGetNeInfo(neType, neIds[0]) + neInfo, err := dborm.XormGetNeInfo(neType, neIds[0]) if err != nil { log.Error("dborm.XormGetNeInfo is failed:", err) services.ResponseInternalServerError500DatabaseOperationFailed(w) diff --git a/features/security/account.go b/features/security/account.go index 165c386..0ced4c2 100644 --- a/features/security/account.go +++ b/features/security/account.go @@ -152,11 +152,11 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) { func LogoutFromOMC(w http.ResponseWriter, r *http.Request) { log.Info("LogoutFromOMC processing... ") - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } // // check media type(content type) only support "application/json" // if services.IsVallidContentType(r, config.GetYamlConfig().OMC.CheckContentType) == false { // log.Error("Invalid Content-Type") @@ -180,14 +180,14 @@ func LogoutFromOMC(w http.ResponseWriter, r *http.Request) { // return // } - se, err := dborm.XormLogoutUpdateSession(token) - if err != nil { - log.Error("Uri is invalid") - services.ResponseNotFound404UriNotExist(w, r) - return - } + // se, err := dborm.XormLogoutUpdateSession(token) + // if err != nil { + // log.Error("Uri is invalid") + // services.ResponseNotFound404UriNotExist(w, r) + // return + // } // 清除缓存用户信息 - account.ClearLoginUser(se.AccountId) + // account.ClearLoginUser(se.AccountId) services.ResponseStatusOK200Null(w) } diff --git a/features/sm/backup.go b/features/sm/backup.go index 4e1dc45..ce39084 100644 --- a/features/sm/backup.go +++ b/features/sm/backup.go @@ -30,11 +30,11 @@ type OMCLocalTime struct { func GetOMCLocalTime(w http.ResponseWriter, r *http.Request) { log.Debug("GetOMCLocalTime processing... ") - _, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Http request error:", err) - return - } + // _, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Http request error:", err) + // return + // } t := time.Now() _, offset := t.Zone() diff --git a/features/state/getstate.go b/features/state/getstate.go index d8222a1..73520eb 100644 --- a/features/state/getstate.go +++ b/features/state/getstate.go @@ -192,12 +192,12 @@ func GetOneLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) { services.ResponseNotFound404UriNotExist(w, r) return } - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("AccessToken:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("AccessToken:", token) neInfo, err := dborm.XormGetNeInfo(neType, neId) if err != nil { @@ -247,7 +247,7 @@ func GetOneLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) @@ -310,15 +310,15 @@ func GetAllLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) { data := make([]map[string]interface{}, 0) - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("AccessToken:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("AccessToken:", token) var neList []dborm.NeInfo - _, err = dborm.XormGetAllNeInfo(&neList) + _, err := dborm.XormGetAllNeInfo(&neList) if err != nil { log.Error("Failed to XormGetAllNeInfo:", err) services.ResponseInternalServerError500ProcessError(w, err) @@ -363,7 +363,7 @@ func GetAllLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) { resp, err := client.SetTimeout(time.Duration(1 * time.Second)).R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) @@ -434,12 +434,12 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) { services.ResponseNotFound404UriNotExist(w, r) return } - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("AccessToken:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("AccessToken:", token) neInfo, err := dborm.XormGetNeInfo(neType, neId) if err != nil { @@ -489,7 +489,7 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) @@ -581,15 +581,15 @@ func GetAllSysinfoFromNF(w http.ResponseWriter, r *http.Request) { data := make([]map[string]interface{}, 0) - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("AccessToken:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("AccessToken:", token) var neList []dborm.NeInfo - _, err = dborm.XormGetAllNeInfo(&neList) + _, err := dborm.XormGetAllNeInfo(&neList) if err != nil { log.Error("Failed to XormGetAllNeInfo:", err) services.ResponseInternalServerError500ProcessError(w, err) @@ -634,7 +634,7 @@ func GetAllSysinfoFromNF(w http.ResponseWriter, r *http.Request) { resp, err := client.SetTimeout(time.Duration(1 * time.Second)).R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) @@ -846,12 +846,12 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) { services.ResponseNotFound404UriNotExist(w, r) return } - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("AccessToken:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("AccessToken:", token) switch strings.ToLower(neType) { case "all": @@ -866,7 +866,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"AccessToken": token}). + // SetHeaders(map[string]string{"AccessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(getNeInfoURI) @@ -893,7 +893,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(getNeInfoURI) @@ -924,7 +924,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) diff --git a/features/trace/trace.go b/features/trace/trace.go index f07f21f..e90d377 100644 --- a/features/trace/trace.go +++ b/features/trace/trace.go @@ -67,12 +67,12 @@ func PostTraceTaskToNF(w http.ResponseWriter, r *http.Request) { //vars := mux.Vars(r) - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("AccessToken:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("AccessToken:", token) body, err := io.ReadAll(io.LimitReader(r.Body, int64(config.GetYamlConfig().Params.UriMaxLen))) if err != nil { @@ -194,12 +194,12 @@ func PutTraceTaskToNF(w http.ResponseWriter, r *http.Request) { //vars := mux.Vars(r) - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("AccessToken:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("AccessToken:", token) body, err := io.ReadAll(io.LimitReader(r.Body, int64(config.GetYamlConfig().Params.UriMaxLen))) if err != nil { @@ -311,17 +311,17 @@ func PutTraceTaskToNF(w http.ResponseWriter, r *http.Request) { func DeleteTraceTaskToNF(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteTraceTaskToNF processing... ") - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("AccessToken:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("AccessToken:", token) vars := r.URL.Query() ids, ok := vars["id"] if !ok || len(ids) == 0 { - err = global.ErrTraceNotCarriedTaskID + err := global.ErrTraceNotCarriedTaskID log.Error(err) services.ResponseInternalServerError500ProcessError(w, err) return @@ -332,7 +332,7 @@ func DeleteTraceTaskToNF(w http.ResponseWriter, r *http.Request) { log.Debug("id:", id) var succNes []string - err = dborm.XormGetColStringArrayByWhere("trace_task", "succ_nes", fmt.Sprintf("id=%s", id), &succNes) + err := dborm.XormGetColStringArrayByWhere("trace_task", "succ_nes", fmt.Sprintf("id=%s", id), &succNes) if err != nil { log.Error("Failed to dborm.XormGetSingleColStringArrayByWhere:", err) services.ResponseInternalServerError500ProcessError(w, err) diff --git a/features/ue/ue.go b/features/ue/ue.go index e92db2e..04a7221 100644 --- a/features/ue/ue.go +++ b/features/ue/ue.go @@ -131,12 +131,12 @@ func GetAvailableAMFsFromNSSF(w http.ResponseWriter, r *http.Request) { return } - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("token:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("token:", token) neInfo, err := dborm.XormGetNeInfo(neType, neId) if err != nil { @@ -159,7 +159,7 @@ func GetAvailableAMFsFromNSSF(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) @@ -195,12 +195,12 @@ func GetSubscriptionsFromNSSF(w http.ResponseWriter, r *http.Request) { return } - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("token:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("token:", token) neInfo, err := dborm.XormGetNeInfo(neType, neId) if err != nil { @@ -223,7 +223,7 @@ func GetSubscriptionsFromNSSF(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) @@ -259,12 +259,12 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) { return } - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("token:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("token:", token) neInfo, err := dborm.XormGetNeInfo(neType, neId) if err != nil { @@ -287,7 +287,7 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) @@ -536,12 +536,12 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) { return } - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("token:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("token:", token) neInfo, err := dborm.XormGetNeInfo(neType, neId) if err != nil { @@ -564,7 +564,7 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) @@ -600,12 +600,12 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) { return } - token, err := services.CheckFrontValidRequest(w, r) - if err != nil { - log.Error("Request error:", err) - return - } - log.Debug("token:", token) + // token, err := services.CheckFrontValidRequest(w, r) + // if err != nil { + // log.Error("Request error:", err) + // return + // } + // log.Debug("token:", token) neInfo, err := dborm.XormGetNeInfo(neType, neId) if err != nil { @@ -628,7 +628,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) { resp, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}). - SetHeaders(map[string]string{"accessToken": token}). + // SetHeaders(map[string]string{"accessToken": token}). SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI2NF) diff --git a/lib/mmlp/parse.go b/lib/mmlp/parse.go index e713242..71c1c1a 100644 --- a/lib/mmlp/parse.go +++ b/lib/mmlp/parse.go @@ -508,7 +508,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) { response, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}). - SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). + // SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). SetHeaders(map[string]string{"User-Agent": omcMmlVar.UserAgent}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Get(requestURI) @@ -525,7 +525,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) { response, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}). - SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). + // SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). SetHeaders(map[string]string{"User-Agent": omcMmlVar.UserAgent}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). SetBody(*body). @@ -559,7 +559,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) { response, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}). - SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). + // SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). SetHeaders(map[string]string{"User-Agent": omcMmlVar.UserAgent}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). SetBody(*body). @@ -576,7 +576,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) { response, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}). - SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). + // SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). SetHeaders(map[string]string{"User-Agent": omcMmlVar.UserAgent}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Delete(requestURI) @@ -592,7 +592,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) { response, err := client.R(). EnableTrace(). SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}). - SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). + // SetHeaders(map[string]string{"accessToken": omcMmlVar.SessionToken}). SetHeaders(map[string]string{"User-Agent": omcMmlVar.UserAgent}). SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}). Patch(requestURI) diff --git a/lib/services/services.go b/lib/services/services.go index 79eedae..6b732dc 100644 --- a/lib/services/services.go +++ b/lib/services/services.go @@ -450,66 +450,66 @@ func CheckFrontValidRequest(w http.ResponseWriter, r *http.Request) (string, err log.Debug("CheckFrontValidRequest processing... ") var token string = "" - var err error - var ret bool - // response 414-4 uri too long ? (optional) - // todo ... ? - if bytes.Count([]byte(r.RequestURI), nil) > config.GetUriMaxLenFromConfig() { - err = errors.New("request Uri too long") - log.Errorf("Request Uri too long: bytes=%d, MaxLen=%d", bytes.Count([]byte(r.RequestURI), nil), config.GetUriMaxLenFromConfig()) - ResponseRequestURITooLong414UriTooLong(w) - return token, err - } + // var err error + // var ret bool + // // response 414-4 uri too long ? (optional) + // // todo ... ? + // if bytes.Count([]byte(r.RequestURI), nil) > config.GetUriMaxLenFromConfig() { + // err = errors.New("request Uri too long") + // log.Errorf("Request Uri too long: bytes=%d, MaxLen=%d", bytes.Count([]byte(r.RequestURI), nil), config.GetUriMaxLenFromConfig()) + // ResponseRequestURITooLong414UriTooLong(w) + // return token, err + // } - /* - // check media type(content type) only support "application/json" - // response 415-1 - if !IsVallidContentType(r) { - err := errors.New("Invalid Content-Type") - log.Error(err) - ResponseUnsupportedMediaType415(w) - return err - } - */ + // /* + // // check media type(content type) only support "application/json" + // // response 415-1 + // if !IsVallidContentType(r) { + // err := errors.New("Invalid Content-Type") + // log.Error(err) + // ResponseUnsupportedMediaType415(w) + // return err + // } + // */ - // error processing ... - // 401-1 response - if config.GetYamlConfig().Auth.Token && !IsLocalhost(r.RemoteAddr) { - token, ret = oauth.IsCarriedToken(r) - if !ret { - err = errors.New("accessToken is not carried") - log.Error(err) - ResponseUnauthorized401AccessTokenNotCarried(w) - return token, err - } + // // error processing ... + // // 401-1 response + // if config.GetYamlConfig().Auth.Token && !IsLocalhost(r.RemoteAddr) { + // token, ret = oauth.IsCarriedToken(r) + // if !ret { + // err = errors.New("accessToken is not carried") + // log.Error(err) + // ResponseUnauthorized401AccessTokenNotCarried(w) + // return token, err + // } - // 401-2 response - if !dborm.XormExistValidToken(token, config.GetExpiresFromConfig()) { - err = errors.New("accessToken fails or does not exist") - log.Error(err) - ResponseUnauthorized401AccessTokenNotExist(w) - return token, err - } + // // 401-2 response + // if !dborm.XormExistValidToken(token, config.GetExpiresFromConfig()) { + // err = errors.New("accessToken fails or does not exist") + // log.Error(err) + // ResponseUnauthorized401AccessTokenNotExist(w) + // return token, err + // } - if operType := GetOperationTypeFromHttpRequest(r); operType != "auto" { - _, err = dborm.XormUpdateSessionShakeTime(token) - if err != nil { - log.Error("Failed to update session table:", err) - ResponseUnauthorized401AccessTokenNotExist(w) - return token, err - } - } + // if operType := GetOperationTypeFromHttpRequest(r); operType != "auto" { + // _, err = dborm.XormUpdateSessionShakeTime(token) + // if err != nil { + // log.Error("Failed to update session table:", err) + // ResponseUnauthorized401AccessTokenNotExist(w) + // return token, err + // } + // } - } + // } - vars := mux.Vars(r) - apiVer := vars["apiVersion"] - if apiVer != global.ApiVersionV1 { - err = errors.New("uri is invalid") - log.Error(err) - ResponseNotFound404UriNotExist(w, r) - return token, err - } + // vars := mux.Vars(r) + // apiVer := vars["apiVersion"] + // if apiVer != global.ApiVersionV1 { + // err = errors.New("uri is invalid") + // log.Error(err) + // ResponseNotFound404UriNotExist(w, r) + // return token, err + // } return token, nil }