sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

add web log

Browse Source
This commit is contained in:
YouROK
2021-04-27 10:52:32 +03:00
parent 5f4b702a1a
commit df1d2e4d2f
4 changed files with 97 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/web/blocker/blocker.go
View File

@@ -41,7 +41,7 @@ func Blocker() gin.HandlerFunc {
minifyIP(&ip)
if whiteIpList.NumRanges() > 0 {
if _, ok := whiteIpList.Lookup(ip); !ok {
log.TLogln("Block ip, not in white list", ip.String())
log.WebLogln("Block ip, not in white list", ip.String())
c.String(http.StatusTeapot, "Banned")
c.Abort()
return
@@ -49,7 +49,7 @@ func Blocker() gin.HandlerFunc {
}
if blackIpList.NumRanges() > 0 {
if r, ok := blackIpList.Lookup(ip); ok {
log.TLogln("Block ip, in black list:", ip.String(), "in range", r.Description, ":", r.First, "-", r.Last)
log.WebLogln("Block ip, in black list:", ip.String(), "in range", r.Description, ":", r.First, "-", r.Last)
c.String(http.StatusTeapot, "Banned")
c.Abort()
return

9
server/web/server.go
View File

@@ -3,8 +3,6 @@ package web
import (
"net"
"server/web/blocker"
"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin"
@@ -13,6 +11,7 @@ import (
"server/version"
"server/web/api"
"server/web/auth"
"server/web/blocker"
"server/web/pages"
)
@@ -34,8 +33,12 @@ func Start(port string) {
}
gin.SetMode(gin.ReleaseMode)
corsCfg := cors.DefaultConfig()
corsCfg.AllowAllOrigins = true
corsCfg.AllowHeaders = []string{"Origin", "Content-Length", "Content-Type", "X-Requested-With", "Accept", "Authorization"}
route := gin.New()
route.Use(gin.Recovery(), cors.Default(), blocker.Blocker())
route.Use(log.WebLogger(), blocker.Blocker(), gin.Recovery(), cors.New(corsCfg))
route.GET("/echo", echo)