fix: 取消内部accessToken请求头,移除CheckFrontValidRequest检查token
This commit is contained in:
@@ -29,11 +29,11 @@ var (
|
|||||||
func UploadLicenseFile(w http.ResponseWriter, r *http.Request) {
|
func UploadLicenseFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("UploadLicenseFile processing... ")
|
log.Debug("UploadLicenseFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -51,11 +51,11 @@ func UploadLicenseFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) {
|
func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DownloadLicenseFile processing... ")
|
log.Debug("DownloadLicenseFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -97,11 +97,11 @@ func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DeleteLcenseFile(w http.ResponseWriter, r *http.Request) {
|
func DeleteLcenseFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DeleteLcenseFile processing... ")
|
log.Debug("DeleteLcenseFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -173,11 +173,11 @@ func init() {
|
|||||||
func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) {
|
func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Info("UploadLicenseFileData processing... ")
|
log.Info("UploadLicenseFileData processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
|
|||||||
@@ -70,11 +70,11 @@ func init() {
|
|||||||
func GetNeInfo(w http.ResponseWriter, r *http.Request) {
|
func GetNeInfo(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("GetNeInfo processing... ")
|
log.Debug("GetNeInfo processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -112,11 +112,11 @@ type OmcNeConfig struct {
|
|||||||
func PostNeInfo(w http.ResponseWriter, r *http.Request) {
|
func PostNeInfo(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("PostNeInfo processing... ")
|
log.Debug("PostNeInfo processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -226,11 +226,11 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
|
|||||||
func PutNeInfo(w http.ResponseWriter, r *http.Request) {
|
func PutNeInfo(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("PutNeInfo processing... ")
|
log.Debug("PutNeInfo processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -337,11 +337,11 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DeleteNeInfo(w http.ResponseWriter, r *http.Request) {
|
func DeleteNeInfo(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DeleteNeInfo processing... ")
|
log.Debug("DeleteNeInfo processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -420,11 +420,11 @@ func IsActiveNF(neInfo *dborm.NeInfo) bool {
|
|||||||
func ExportCmFromNF(w http.ResponseWriter, r *http.Request) {
|
func ExportCmFromNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("ExportCmFromNF processing... ")
|
log.Debug("ExportCmFromNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -561,11 +561,11 @@ type ImportCMJson struct {
|
|||||||
func ImportCmToNF(w http.ResponseWriter, r *http.Request) {
|
func ImportCmToNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("ImportCmToNF processing... ")
|
log.Debug("ImportCmToNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -595,12 +595,13 @@ func ImportCmToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
path = config.GetYamlConfig().OMC.Backup
|
path = config.GetYamlConfig().OMC.Backup
|
||||||
} else {
|
} else {
|
||||||
path = config.GetYamlConfig().OMC.Upload
|
path = config.GetYamlConfig().OMC.Upload
|
||||||
fileName, err = services.HandleUploadFile(r, path, "")
|
fileNamePath, err := services.HandleUploadFile(r, path, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Faile to HandleUploadFile:", err)
|
log.Error("Faile to HandleUploadFile:", err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, err)
|
services.ResponseInternalServerError500ProcessError(w, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
fileName = fileNamePath
|
||||||
}
|
}
|
||||||
filePath := fmt.Sprintf("%s/%s", path, fileName)
|
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) {
|
func DownloadNeBackupFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DownloadNeBackupFile processing... ")
|
log.Debug("DownloadNeBackupFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -767,11 +768,11 @@ func DownloadNeBackupFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DeleteNeBackupFile(w http.ResponseWriter, r *http.Request) {
|
func DeleteNeBackupFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DeleteNeBackupFile processing... ")
|
log.Debug("DeleteNeBackupFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -826,11 +827,11 @@ func DeleteNeBackupFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
|
func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("PostNeServiceAction processing... ")
|
log.Debug("PostNeServiceAction processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -912,11 +913,11 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) {
|
|||||||
func PostNeInstanceAction(w http.ResponseWriter, r *http.Request) {
|
func PostNeInstanceAction(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("PostNeInstanceAction processing... ")
|
log.Debug("PostNeInstanceAction processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
|
|||||||
@@ -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) {
|
func UploadSoftwareFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("UploadSoftwareFile processing... ")
|
log.Debug("UploadSoftwareFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -191,11 +191,11 @@ func UploadSoftwareFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) {
|
func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Info("UploadSoftwareMultiFile processing... ")
|
log.Info("UploadSoftwareMultiFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -216,7 +216,7 @@ func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
md5Param := services.GetUriParamString(r, "md5Sum", ",", false, false)
|
md5Param := services.GetUriParamString(r, "md5Sum", ",", false, false)
|
||||||
|
|
||||||
softwarePath := fmt.Sprintf("%s/%s", config.GetYamlConfig().OMC.Software, neTypeLower)
|
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 {
|
if err != nil {
|
||||||
log.Error("Failed to Mkdir:", err)
|
log.Error("Failed to Mkdir:", err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, err)
|
services.ResponseInternalServerError500ProcessError(w, err)
|
||||||
@@ -372,11 +372,11 @@ func UploadSoftwareMultiFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DownloadSoftwareFile(w http.ResponseWriter, r *http.Request) {
|
func DownloadSoftwareFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DownloadSoftwareFile processing... ")
|
log.Debug("DownloadSoftwareFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -418,11 +418,11 @@ func DownloadSoftwareFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DeleteSoftwareFile(w http.ResponseWriter, r *http.Request) {
|
func DeleteSoftwareFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DeleteSoftwareFile processing... ")
|
log.Debug("DeleteSoftwareFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -478,11 +478,11 @@ func DeleteSoftwareFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) {
|
func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DistributeSoftwareFile processing... ")
|
log.Debug("DistributeSoftwareFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -618,11 +618,11 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) {
|
func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("ActiveSoftwareToNF processing... ")
|
log.Debug("ActiveSoftwareToNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
@@ -825,11 +825,11 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) {
|
func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("ActiveSoftwareToNF processing... ")
|
log.Debug("ActiveSoftwareToNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
|
|||||||
@@ -514,11 +514,11 @@ func DatabaseGetData(w http.ResponseWriter, r *http.Request) {
|
|||||||
var sql []string
|
var sql []string
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
_, err = services.CheckFrontValidRequest(w, r)
|
// _, err = services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
tblName := vars["objectTypeValue"]
|
tblName := vars["objectTypeValue"]
|
||||||
|
|||||||
@@ -37,11 +37,11 @@ var (
|
|||||||
func UploadFile(w http.ResponseWriter, r *http.Request) {
|
func UploadFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("UploadFile processing... ")
|
log.Debug("UploadFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
location := vars["location"]
|
location := vars["location"]
|
||||||
@@ -63,20 +63,22 @@ func UploadFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
if location == "upload" {
|
if location == "upload" {
|
||||||
path = config.GetYamlConfig().OMC.Upload
|
path = config.GetYamlConfig().OMC.Upload
|
||||||
fileName, err = services.HandleUploadFile(r, path, fileName)
|
fileNamePath, err := services.HandleUploadFile(r, path, fileName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Faile to HandleUploadFile:", err)
|
log.Error("Faile to HandleUploadFile:", err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, err)
|
services.ResponseInternalServerError500ProcessError(w, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
fileName = fileNamePath
|
||||||
} else {
|
} else {
|
||||||
path = config.GetYamlConfig().OMC.FrontUpload
|
path = config.GetYamlConfig().OMC.FrontUpload
|
||||||
fileName, err = services.HandleUploadFile(r, path, fileName)
|
fileName, err := services.HandleUploadFile(r, path, fileName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Faile to HandleUploadFile:", err)
|
log.Error("Faile to HandleUploadFile:", err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, err)
|
services.ResponseInternalServerError500ProcessError(w, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
fileName = fileName
|
||||||
}
|
}
|
||||||
log.Debugf("upload file=%s to path=%s", fileName, path)
|
log.Debugf("upload file=%s to path=%s", fileName, path)
|
||||||
|
|
||||||
@@ -87,11 +89,11 @@ func UploadFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DownloadFile(w http.ResponseWriter, r *http.Request) {
|
func DownloadFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DownloadFile processing... ")
|
log.Debug("DownloadFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
location := vars["location"]
|
location := vars["location"]
|
||||||
@@ -132,11 +134,11 @@ func DownloadFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DeleteFile(w http.ResponseWriter, r *http.Request) {
|
func DeleteFile(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DeleteFile processing... ")
|
log.Debug("DeleteFile processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["neType"]
|
neType := vars["neType"]
|
||||||
|
|||||||
@@ -473,11 +473,11 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
|
func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("GetAlarmFromNF processing... ")
|
log.Debug("GetAlarmFromNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
neTypeLower := strings.ToLower(neType)
|
neTypeLower := strings.ToLower(neType)
|
||||||
@@ -491,7 +491,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
//var neInfo *dborm.NeInfo
|
//var neInfo *dborm.NeInfo
|
||||||
var nes []dborm.NeInfo
|
var nes []dborm.NeInfo
|
||||||
_, err = dborm.XormGetAllNeInfo(&nes)
|
_, err := dborm.XormGetAllNeInfo(&nes)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Failed to get all ne info:", err)
|
log.Error("Failed to get all ne info:", err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, err)
|
services.ResponseInternalServerError500ProcessError(w, err)
|
||||||
|
|||||||
@@ -412,11 +412,11 @@ func PostMeasureReportFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("PostMeasureTaskToNF processing... ")
|
log.Debug("PostMeasureTaskToNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -588,11 +588,11 @@ func PutMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DeleteMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
func DeleteMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DeleteMeasureTaskToNF processing... ")
|
log.Debug("DeleteMeasureTaskToNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -719,11 +719,11 @@ func DeleteMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("PatchMeasureTaskToNF processing... ")
|
log.Debug("PatchMeasureTaskToNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
neType := vars["elementTypeValue"]
|
neType := vars["elementTypeValue"]
|
||||||
@@ -915,11 +915,11 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
|
func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("GetMeasurementFromNF processing... ")
|
log.Debug("GetMeasurementFromNF processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
apiVer := vars["apiVersion"]
|
apiVer := vars["apiVersion"]
|
||||||
@@ -947,7 +947,7 @@ func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
//var neInfo *dborm.NeInfo
|
//var neInfo *dborm.NeInfo
|
||||||
neInfo := new(dborm.NeInfo)
|
neInfo := new(dborm.NeInfo)
|
||||||
|
|
||||||
neInfo, err = dborm.XormGetNeInfo(neType, neIds[0])
|
neInfo, err := dborm.XormGetNeInfo(neType, neIds[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("dborm.XormGetNeInfo is failed:", err)
|
log.Error("dborm.XormGetNeInfo is failed:", err)
|
||||||
services.ResponseInternalServerError500DatabaseOperationFailed(w)
|
services.ResponseInternalServerError500DatabaseOperationFailed(w)
|
||||||
|
|||||||
@@ -150,11 +150,11 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
|
|||||||
func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
|
func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Info("LogoutFromOMC processing... ")
|
log.Info("LogoutFromOMC processing... ")
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
// // check media type(content type) only support "application/json"
|
// // check media type(content type) only support "application/json"
|
||||||
// if services.IsVallidContentType(r, config.GetYamlConfig().OMC.CheckContentType) == false {
|
// if services.IsVallidContentType(r, config.GetYamlConfig().OMC.CheckContentType) == false {
|
||||||
// log.Error("Invalid Content-Type")
|
// log.Error("Invalid Content-Type")
|
||||||
@@ -178,14 +178,14 @@ func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
|
|||||||
// return
|
// return
|
||||||
// }
|
// }
|
||||||
|
|
||||||
se, err := dborm.XormLogoutUpdateSession(token)
|
// se, err := dborm.XormLogoutUpdateSession(token)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Uri is invalid")
|
// log.Error("Uri is invalid")
|
||||||
services.ResponseNotFound404UriNotExist(w, r)
|
// services.ResponseNotFound404UriNotExist(w, r)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
// 清除缓存用户信息
|
// 清除缓存用户信息
|
||||||
account.ClearLoginUser(se.AccountId)
|
// account.ClearLoginUser(se.AccountId)
|
||||||
services.ResponseStatusOK200Null(w)
|
services.ResponseStatusOK200Null(w)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,11 +29,11 @@ type OMCLocalTime struct {
|
|||||||
func GetOMCLocalTime(w http.ResponseWriter, r *http.Request) {
|
func GetOMCLocalTime(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("GetOMCLocalTime processing... ")
|
log.Debug("GetOMCLocalTime processing... ")
|
||||||
|
|
||||||
_, err := services.CheckFrontValidRequest(w, r)
|
// _, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Http request error:", err)
|
// log.Error("Http request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
|
|
||||||
t := time.Now()
|
t := time.Now()
|
||||||
_, offset := t.Zone()
|
_, offset := t.Zone()
|
||||||
|
|||||||
@@ -192,12 +192,12 @@ func GetOneLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
services.ResponseNotFound404UriNotExist(w, r)
|
services.ResponseNotFound404UriNotExist(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("AccessToken:", token)
|
// log.Debug("AccessToken:", token)
|
||||||
|
|
||||||
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -247,7 +247,7 @@ func GetOneLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
@@ -310,15 +310,15 @@ func GetAllLicenseInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
data := make([]map[string]interface{}, 0)
|
data := make([]map[string]interface{}, 0)
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("AccessToken:", token)
|
// log.Debug("AccessToken:", token)
|
||||||
|
|
||||||
var neList []dborm.NeInfo
|
var neList []dborm.NeInfo
|
||||||
_, err = dborm.XormGetAllNeInfo(&neList)
|
_, err := dborm.XormGetAllNeInfo(&neList)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Failed to XormGetAllNeInfo:", err)
|
log.Error("Failed to XormGetAllNeInfo:", err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, 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().
|
resp, err := client.SetTimeout(time.Duration(1 * time.Second)).R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
@@ -434,12 +434,12 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
services.ResponseNotFound404UriNotExist(w, r)
|
services.ResponseNotFound404UriNotExist(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("AccessToken:", token)
|
// log.Debug("AccessToken:", token)
|
||||||
|
|
||||||
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -489,7 +489,7 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
@@ -581,15 +581,15 @@ func GetAllSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
data := make([]map[string]interface{}, 0)
|
data := make([]map[string]interface{}, 0)
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("AccessToken:", token)
|
// log.Debug("AccessToken:", token)
|
||||||
|
|
||||||
var neList []dborm.NeInfo
|
var neList []dborm.NeInfo
|
||||||
_, err = dborm.XormGetAllNeInfo(&neList)
|
_, err := dborm.XormGetAllNeInfo(&neList)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Failed to XormGetAllNeInfo:", err)
|
log.Error("Failed to XormGetAllNeInfo:", err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, 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().
|
resp, err := client.SetTimeout(time.Duration(1 * time.Second)).R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
@@ -846,12 +846,12 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
|
|||||||
services.ResponseNotFound404UriNotExist(w, r)
|
services.ResponseNotFound404UriNotExist(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("AccessToken:", token)
|
// log.Debug("AccessToken:", token)
|
||||||
|
|
||||||
switch strings.ToLower(neType) {
|
switch strings.ToLower(neType) {
|
||||||
case "all":
|
case "all":
|
||||||
@@ -866,7 +866,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(getNeInfoURI)
|
Get(getNeInfoURI)
|
||||||
@@ -893,7 +893,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(getNeInfoURI)
|
Get(getNeInfoURI)
|
||||||
@@ -924,7 +924,7 @@ func GetStateFromNFOld(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
|
|||||||
@@ -67,12 +67,12 @@ func PostTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
//vars := mux.Vars(r)
|
//vars := mux.Vars(r)
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("AccessToken:", token)
|
// log.Debug("AccessToken:", token)
|
||||||
|
|
||||||
body, err := io.ReadAll(io.LimitReader(r.Body, int64(config.GetYamlConfig().Params.UriMaxLen)))
|
body, err := io.ReadAll(io.LimitReader(r.Body, int64(config.GetYamlConfig().Params.UriMaxLen)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -194,12 +194,12 @@ func PutTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
//vars := mux.Vars(r)
|
//vars := mux.Vars(r)
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("AccessToken:", token)
|
// log.Debug("AccessToken:", token)
|
||||||
|
|
||||||
body, err := io.ReadAll(io.LimitReader(r.Body, int64(config.GetYamlConfig().Params.UriMaxLen)))
|
body, err := io.ReadAll(io.LimitReader(r.Body, int64(config.GetYamlConfig().Params.UriMaxLen)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -311,17 +311,17 @@ func PutTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
func DeleteTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
|
func DeleteTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
|
||||||
log.Debug("DeleteTraceTaskToNF processing... ")
|
log.Debug("DeleteTraceTaskToNF processing... ")
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("AccessToken:", token)
|
// log.Debug("AccessToken:", token)
|
||||||
|
|
||||||
vars := r.URL.Query()
|
vars := r.URL.Query()
|
||||||
ids, ok := vars["id"]
|
ids, ok := vars["id"]
|
||||||
if !ok || len(ids) == 0 {
|
if !ok || len(ids) == 0 {
|
||||||
err = global.ErrTraceNotCarriedTaskID
|
err := global.ErrTraceNotCarriedTaskID
|
||||||
log.Error(err)
|
log.Error(err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, err)
|
services.ResponseInternalServerError500ProcessError(w, err)
|
||||||
return
|
return
|
||||||
@@ -332,7 +332,7 @@ func DeleteTraceTaskToNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
log.Debug("id:", id)
|
log.Debug("id:", id)
|
||||||
|
|
||||||
var succNes []string
|
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 {
|
if err != nil {
|
||||||
log.Error("Failed to dborm.XormGetSingleColStringArrayByWhere:", err)
|
log.Error("Failed to dborm.XormGetSingleColStringArrayByWhere:", err)
|
||||||
services.ResponseInternalServerError500ProcessError(w, err)
|
services.ResponseInternalServerError500ProcessError(w, err)
|
||||||
|
|||||||
@@ -130,12 +130,12 @@ func GetAvailableAMFsFromNSSF(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("token:", token)
|
// log.Debug("token:", token)
|
||||||
|
|
||||||
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -158,7 +158,7 @@ func GetAvailableAMFsFromNSSF(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
@@ -194,12 +194,12 @@ func GetSubscriptionsFromNSSF(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("token:", token)
|
// log.Debug("token:", token)
|
||||||
|
|
||||||
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -222,7 +222,7 @@ func GetSubscriptionsFromNSSF(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
@@ -258,12 +258,12 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("token:", token)
|
// log.Debug("token:", token)
|
||||||
|
|
||||||
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -286,7 +286,7 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
@@ -535,12 +535,12 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("token:", token)
|
// log.Debug("token:", token)
|
||||||
|
|
||||||
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -563,7 +563,7 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
@@ -599,12 +599,12 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := services.CheckFrontValidRequest(w, r)
|
// token, err := services.CheckFrontValidRequest(w, r)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Request error:", err)
|
// log.Error("Request error:", err)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
log.Debug("token:", token)
|
// log.Debug("token:", token)
|
||||||
|
|
||||||
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -627,7 +627,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp, err := client.R().
|
resp, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
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{"User-Agent": config.GetDefaultUserAgent()}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI2NF)
|
Get(requestURI2NF)
|
||||||
|
|||||||
@@ -507,7 +507,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) {
|
|||||||
response, err := client.R().
|
response, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}).
|
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{"User-Agent": omcMmlVar.UserAgent}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Get(requestURI)
|
Get(requestURI)
|
||||||
@@ -524,7 +524,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) {
|
|||||||
response, err := client.R().
|
response, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}).
|
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{"User-Agent": omcMmlVar.UserAgent}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
SetBody(*body).
|
SetBody(*body).
|
||||||
@@ -558,7 +558,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) {
|
|||||||
response, err := client.R().
|
response, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}).
|
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{"User-Agent": omcMmlVar.UserAgent}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
SetBody(*body).
|
SetBody(*body).
|
||||||
@@ -575,7 +575,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) {
|
|||||||
response, err := client.R().
|
response, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}).
|
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{"User-Agent": omcMmlVar.UserAgent}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Delete(requestURI)
|
Delete(requestURI)
|
||||||
@@ -591,7 +591,7 @@ func TransMml2HttpReq(omcMmlVar *MmlVar, mml *MmlCommand) (*[]byte, error) {
|
|||||||
response, err := client.R().
|
response, err := client.R().
|
||||||
EnableTrace().
|
EnableTrace().
|
||||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: omcMmlVar.Authorization}).
|
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{"User-Agent": omcMmlVar.UserAgent}).
|
||||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||||
Patch(requestURI)
|
Patch(requestURI)
|
||||||
|
|||||||
@@ -449,66 +449,66 @@ func CheckFrontValidRequest(w http.ResponseWriter, r *http.Request) (string, err
|
|||||||
log.Debug("CheckFrontValidRequest processing... ")
|
log.Debug("CheckFrontValidRequest processing... ")
|
||||||
|
|
||||||
var token string = ""
|
var token string = ""
|
||||||
var err error
|
// var err error
|
||||||
var ret bool
|
// var ret bool
|
||||||
// response 414-4 uri too long ? (optional)
|
// // response 414-4 uri too long ? (optional)
|
||||||
// todo ... ?
|
// // todo ... ?
|
||||||
if bytes.Count([]byte(r.RequestURI), nil) > config.GetUriMaxLenFromConfig() {
|
// if bytes.Count([]byte(r.RequestURI), nil) > config.GetUriMaxLenFromConfig() {
|
||||||
err = errors.New("request Uri too long")
|
// 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())
|
// log.Errorf("Request Uri too long: bytes=%d, MaxLen=%d", bytes.Count([]byte(r.RequestURI), nil), config.GetUriMaxLenFromConfig())
|
||||||
ResponseRequestURITooLong414UriTooLong(w)
|
// ResponseRequestURITooLong414UriTooLong(w)
|
||||||
return token, err
|
// return token, err
|
||||||
}
|
// }
|
||||||
|
|
||||||
/*
|
// /*
|
||||||
// check media type(content type) only support "application/json"
|
// // check media type(content type) only support "application/json"
|
||||||
// response 415-1
|
// // response 415-1
|
||||||
if !IsVallidContentType(r) {
|
// if !IsVallidContentType(r) {
|
||||||
err := errors.New("Invalid Content-Type")
|
// err := errors.New("Invalid Content-Type")
|
||||||
log.Error(err)
|
// log.Error(err)
|
||||||
ResponseUnsupportedMediaType415(w)
|
// ResponseUnsupportedMediaType415(w)
|
||||||
return err
|
// return err
|
||||||
}
|
// }
|
||||||
*/
|
// */
|
||||||
|
|
||||||
// error processing ...
|
// // error processing ...
|
||||||
// 401-1 response
|
// // 401-1 response
|
||||||
if config.GetYamlConfig().Auth.Token && !IsLocalhost(r.RemoteAddr) {
|
// if config.GetYamlConfig().Auth.Token && !IsLocalhost(r.RemoteAddr) {
|
||||||
token, ret = oauth.IsCarriedToken(r)
|
// token, ret = oauth.IsCarriedToken(r)
|
||||||
if !ret {
|
// if !ret {
|
||||||
err = errors.New("accessToken is not carried")
|
// err = errors.New("accessToken is not carried")
|
||||||
log.Error(err)
|
// log.Error(err)
|
||||||
ResponseUnauthorized401AccessTokenNotCarried(w)
|
// ResponseUnauthorized401AccessTokenNotCarried(w)
|
||||||
return token, err
|
// return token, err
|
||||||
}
|
// }
|
||||||
|
|
||||||
// 401-2 response
|
// // 401-2 response
|
||||||
if !dborm.XormExistValidToken(token, config.GetExpiresFromConfig()) {
|
// if !dborm.XormExistValidToken(token, config.GetExpiresFromConfig()) {
|
||||||
err = errors.New("accessToken fails or does not exist")
|
// err = errors.New("accessToken fails or does not exist")
|
||||||
log.Error(err)
|
// log.Error(err)
|
||||||
ResponseUnauthorized401AccessTokenNotExist(w)
|
// ResponseUnauthorized401AccessTokenNotExist(w)
|
||||||
return token, err
|
// return token, err
|
||||||
}
|
// }
|
||||||
|
|
||||||
if operType := GetOperationTypeFromHttpRequest(r); operType != "auto" {
|
// if operType := GetOperationTypeFromHttpRequest(r); operType != "auto" {
|
||||||
_, err = dborm.XormUpdateSessionShakeTime(token)
|
// _, err = dborm.XormUpdateSessionShakeTime(token)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
log.Error("Failed to update session table:", err)
|
// log.Error("Failed to update session table:", err)
|
||||||
ResponseUnauthorized401AccessTokenNotExist(w)
|
// ResponseUnauthorized401AccessTokenNotExist(w)
|
||||||
return token, err
|
// return token, err
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
}
|
// }
|
||||||
|
|
||||||
vars := mux.Vars(r)
|
// vars := mux.Vars(r)
|
||||||
apiVer := vars["apiVersion"]
|
// apiVer := vars["apiVersion"]
|
||||||
if apiVer != global.ApiVersionV1 {
|
// if apiVer != global.ApiVersionV1 {
|
||||||
err = errors.New("uri is invalid")
|
// err = errors.New("uri is invalid")
|
||||||
log.Error(err)
|
// log.Error(err)
|
||||||
ResponseNotFound404UriNotExist(w, r)
|
// ResponseNotFound404UriNotExist(w, r)
|
||||||
return token, err
|
// return token, err
|
||||||
}
|
// }
|
||||||
|
|
||||||
return token, nil
|
return token, nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user