update

Author: abbycin

blog_default.toml

@@ -8,6 +8,8 @@ addr = ":8888"
 assets = "ROOT/assets"
 images = "/tmp/images"
 db_file = "/tmp/blog.db"
+# affect remote addr
+proxy_mode = true
 [common.logging]
 roll_size = 10 # MB
 roll_interval = 720 # hour

conf/conf.go

@@ -31,11 +31,12 @@ type Blacklist struct {
 }
 
 type Common struct {
-Addr string `toml:"addr"`
-Assets string `toml:"assets"`
-Images string `toml:"images"`
-DbFile string `toml:"db_file"`
-Logging Logging `toml:"logging"`
+Addr string `toml:"addr"`
+Assets string `toml:"assets"`
+Images string `toml:"images"`
+DbFile string `toml:"db_file"`
+Logging Logging `toml:"logging"`
+ProxyMode bool `toml:"proxy_mode"`
 }
 
 type Logging struct {

main.go

@@ -53,7 +53,7 @@ func main() {
 
 access := middleware.NewAccess()
 
-r := routers.New(mgr)
+r := routers.New(mgr, cfg.Common.ProxyMode)
 r.ServeFile(cfg.Service.Assets, cfg.Common.Assets)
 r.AddCb(access)
 

middleware/access.go

@@ -20,5 +20,5 @@ func NewAccess() *Access {
 }
 
 func (a *Access) Serve(c *routers.Context) {
-logging.Info("ACCESS: %s %s %s", c.Req.RemoteAddr, c.Req.Method, c.Req.URL.String())
+logging.Info("ACCESS: %s %s %s", c.RemoteAddr(), c.Req.Method, c.Req.URL.String())
 }

routers/context.go

@@ -14,6 +14,7 @@ import (
 "io/ioutil"
 "net/http"
 "strconv"
+"strings"
 )
 
 const (
@@ -23,11 +24,12 @@ const (
 )
 
 type Context struct {
-Req *http.Request
-Resp http.ResponseWriter
-param *paramImpl
-mgr *session.SessionManager
-next bool
+Req *http.Request
+Resp http.ResponseWriter
+param *paramImpl
+mgr *session.SessionManager
+next bool
+proxyMode bool
 }
 
 func (c *Context) simpleResponse(mime string, code int, data []byte) {
@@ -86,3 +88,11 @@ func (c *Context) Next() {
 func (c *Context) Abort() {
 c.next = false
 }
+
+func (c *Context) RemoteAddr() string {
+if c.proxyMode {
+return c.Req.Header.Get("X-Real-IP")
+} else {
+return strings.Split(c.Req.RemoteAddr, ":")[0]
+}
+}

routers/routers.go

@@ -24,16 +24,18 @@ type Router struct {
 trie map[string]*node
 lru *LRU
 mgr *session.SessionManager
+proxyMode bool
 PanicHandler func(http.ResponseWriter, *http.Request, interface{})
 NotFound func(w http.ResponseWriter, r *http.Request)
 callbacks []IHandler
 }
 
-func New(mgr *session.SessionManager) *Router {
+func New(mgr *session.SessionManager, proxyMode bool) *Router {
 return &Router{
 trie: make(map[string]*node),
 lru: NewLRU(100, 50<<20), // cache max 100 items total 50MB
 mgr: mgr,
+proxyMode: proxyMode,
 callbacks: make([]IHandler, 0),
 NotFound: http.NotFound,
 }
@@ -56,7 +58,7 @@ func (r *Router) dispatch(w http.ResponseWriter, req *http.Request) {
 if handlers == nil {
 r.NotFound(w, req)
 } else {
-ctx := &Context{req, w, param, r.mgr, true}
+ctx := &Context{req, w, param, r.mgr, true, r.proxyMode}
 for _, cb := range r.callbacks {
 cb.Serve(ctx)
 if !ctx.next {

service/editor.go

@@ -98,7 +98,7 @@ func (a *Editor) Put(c *routers.Context) {
 if err != nil {
 c.Json(http.StatusBadRequest, newError(-1, err.Error()))
 } else {
-a.Update(c.Req.URL.Query().Get("id"))
+a.Update(c.GetParam("id"))
 c.Json(http.StatusOK, newError(0, ""))
 }
 }
@@ -117,7 +117,7 @@ func (a *Editor) Put(c *routers.Context) {
 if err != nil {
 c.Json(http.StatusBadRequest, newError(-2, err.Error()))
 } else {
-a.Update(c.Req.URL.Query().Get("id"))
+a.Update(c.GetParam("id"))
 c.Json(http.StatusOK, newError(0, ""))
 }
 }

service/home.go

@@ -127,7 +127,7 @@ func (h *Home) Serve(c *routers.Context) {
 }
 
 func (h *Home) formatTime(arg interface{}) string {
-return arg.(time.Time).Format("2006 01-02 15:04:05")
+return arg.(time.Time).Format("2006-01-02 15:04:05")
 }
 
 func (h *Home) Update(arg interface{}) {

service/login.go

@@ -14,7 +14,6 @@ import (
 "blog/model"
 "blog/routers"
 "net/http"
-"strings"
 "sync"
 "time"
 )
@@ -130,8 +129,9 @@ func (l *Login) Serve(c *routers.Context) {
 }
 
 func (l *Login) HandlePost(c *routers.Context) {
-remoteIp := strings.Split(c.Req.RemoteAddr, ":")[0]
+remoteIp := c.RemoteAddr()
 if !l.bl.valid(remoteIp) {
+logging.Warn("too many attempts: %s", remoteIp)
 c.Json(http.StatusBadRequest, newError(-1, "fuck you!"))
 return
 }

session/session.go

@@ -188,7 +188,7 @@ func (m *SessionManager) newSession(w http.ResponseWriter, r *http.Request) (ISe
 sid := buildId()
 session, e := m.backend.Init(sid)
 if e != nil {
-logging.Info("SessionManager::newSession: %s for: %s", e.Error(), r.RemoteAddr)
+logging.Info("SessionManager::newSession: %s", e.Error())
 }
 cookie := http.Cookie{Name: m.name, Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, MaxAge: int(m.maxAge)}
 http.SetCookie(w, &cookie)
@@ -206,11 +206,11 @@ func (m *SessionManager) StartSession(w http.ResponseWriter, r *http.Request) (s
 } else {
 sid, e := url.QueryUnescape(cookie.Value)
 if e != nil {
-logging.Error("unescape cookie: %s, for: %s", e.Error(), r.RemoteAddr)
+logging.Error("unescape cookie: %s", e.Error())
 }
 session, e = m.backend.Get(sid)
 if e != nil {
-logging.Info("session id is not exists(maybe a previous seesion), create a new one for: %s", r.RemoteAddr)
+logging.Info("session id is not exists(maybe a previous session), create a new one")
 session, _ = m.newSession(w, r)
 }
 }