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

fix: 取消内部accessToken请求头，移除CheckFrontValidRequest检查token

Browse Source
This commit is contained in:
TsMask
2024-03-21 12:15:46 +08:00
parent 9c74776011
commit 65339ea242
14 changed files with 329 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
lib/services/services.go
View File

@@ -449,66 +449,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
}