Nulo/kawipiko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[server] Minor updates.

Browse source
This commit is contained in:
Ciprian Dorin Craciun 2021-12-16 17:18:02 +02:00
parent 497d406595
commit c2ef18990f
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sources/cmd/server/server.go
View file

@ -88,11 +88,10 @@ func (_server *server) Serve (_context *fasthttp.RequestCtx) () {
if _pathLimit := bytes.IndexByte (_path, '?'); _pathLimit > 0 { if _pathLimit := bytes.IndexByte (_path, '?'); _pathLimit > 0 {
_path = _path[: _pathLimit] _path = _path[: _pathLimit]
} }
// FIXME: Decode path according to `decodeArgAppendNoPlus`! // FIXME: Decode path according to `decodeArgAppendNoPlus`!
_pathLen := len (_path) _pathLen := len (_path)
_pathIsRoot := _pathLen == 1
_pathHasSlash := !_pathIsRoot && (_path[_pathLen - 1] == '/')
if ! bytes.Equal (StringToBytes (http.MethodGet), _method) { if ! bytes.Equal (StringToBytes (http.MethodGet), _method) {
log.Printf ("[ww] [bce7a75b] invalid method `%s` for `%s`!\n", BytesToString (_requestHeaders.Method ()), *_requestUriString) log.Printf ("[ww] [bce7a75b] invalid method `%s` for `%s`!\n", BytesToString (_requestHeaders.Method ()), *_requestUriString)
@ -105,26 +104,29 @@ func (_server *server) Serve (_context *fasthttp.RequestCtx) () {
return return
} }
_pathIsRoot := _pathLen == 1
_pathHasSlash := !_pathIsRoot && (_path[_pathLen - 1] == '/')
if bytes.HasPrefix (_path, StringToBytes ("/__/")) { if bytes.HasPrefix (_path, StringToBytes ("/__/")) {
if bytes.Equal (_path, StringToBytes ("/__/heartbeat")) || bytes.HasPrefix (_path, StringToBytes ("/__/heartbeat/")) { if bytes.Equal (_path, StringToBytes ("/__/heartbeat")) || bytes.HasPrefix (_path, StringToBytes ("/__/heartbeat/")) {
_server.ServeStatic (_context, http.StatusOK, HeartbeatDataOk, HeartbeatContentType, HeartbeatContentEncoding, false) _server.ServeStatic (_context, http.StatusOK, HeartbeatDataOk, HeartbeatContentType, HeartbeatContentEncoding, false)
return return
} else if bytes.Equal (_path, StringToBytes ("/__/about")) { } else if bytes.Equal (_path, StringToBytes ("/__/about")) || bytes.Equal (_path, StringToBytes ("/__/about/")) {
_server.ServeStatic (_context, http.StatusOK, AboutBannerData, AboutBannerContentType, AboutBannerContentEncoding, true) _server.ServeStatic (_context, http.StatusOK, AboutBannerData, AboutBannerContentType, AboutBannerContentEncoding, true)
return return
} else if bytes.HasPrefix (_path, StringToBytes ("/__/errors/banners/")) { } else if bytes.HasPrefix (_path, StringToBytes ("/__/banners/errors/")) {
_code := _path[len ("/__/errors/banners/") :] _code := _path[len ("/__/banners/errors/") :]
if _code, _error := strconv.Atoi (BytesToString (*NoEscapeBytes (&_code))); _error == nil { if _code, _error := strconv.Atoi (BytesToString (_code)); _error == nil {
_banner, _bannerFound := ErrorBannersData[uint (_code)] _banner, _bannerFound := ErrorBannersData[uint (_code)]
if (_code > 0) && _bannerFound { if (_code > 0) && _bannerFound {
_server.ServeStatic (_context, http.StatusOK, _banner, ErrorBannerContentType, ErrorBannerContentEncoding, true) _server.ServeStatic (_context, http.StatusOK, _banner, ErrorBannerContentType, ErrorBannerContentEncoding, true)
return return
} }
} }
_server.ServeError (_context, http.StatusNotFound, nil, true) _server.ServeError (_context, http.StatusBadRequest, nil, true)
return return
} else { } else {
_server.ServeError (_context, http.StatusNotFound, nil, true) _server.ServeError (_context, http.StatusBadRequest, nil, true)
return return
} }
} }
@ -145,11 +147,11 @@ func (_server *server) Serve (_context *fasthttp.RequestCtx) () {
switch { switch {
case !_pathIsRoot && !_pathHasSlash : case !_pathIsRoot && !_pathHasSlash :
break // NOP
case _pathSuffix == "/" : case _pathSuffix == "/" :
continue _loop_1 continue _loop_1
case _pathSuffix == "" : case _pathSuffix == "" :
break // NOP
case _pathSuffix[0] == '/' : case _pathSuffix[0] == '/' :
_pathSuffix = _pathSuffix[1:] _pathSuffix = _pathSuffix[1:]
} }