oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-21 18:11:09 +00:00
Code Wiki Activity

Rewrite RealIP() to avoid returning an empty string

Browse source
This commit is contained in:
Frédéric Guillot 2018-06-01 07:22:18 -07:00
parent cf7a7e25fb
commit 3b39f0883c
11 changed files with 117 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ui/login_check.go
View file

@ -5,6 +5,7 @@ import (
"github.com/miniflux/miniflux/http/context"
"github.com/miniflux/miniflux/http/cookie"
"github.com/miniflux/miniflux/http/request"
"github.com/miniflux/miniflux/http/response"
"github.com/miniflux/miniflux/http/response/html"
"github.com/miniflux/miniflux/http/route"
@ -12,7 +13,6 @@ import (
"github.com/miniflux/miniflux/ui/form"
"github.com/miniflux/miniflux/ui/session"
"github.com/miniflux/miniflux/ui/view"
"github.com/tomasen/realip"
)
// CheckLogin validates the username/password and redirects the user to the unread page.
@ -38,7 +38,7 @@ func (c *Controller) CheckLogin(w http.ResponseWriter, r *http.Request) {
return
}
sessionToken, userID, err := c.store.CreateUserSession(authForm.Username, r.UserAgent(), realip.RealIP(r))
sessionToken, userID, err := c.store.CreateUserSession(authForm.Username, r.UserAgent(), request.RealIP(r))
if err != nil {
html.ServerError(w, err)
return

4
ui/oauth2_callback.go
View file

@ -16,8 +16,6 @@ import (
"github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux/ui/session"
"github.com/tomasen/realip"
)
// OAuth2Callback receives the authorization code and create a new session.
@ -107,7 +105,7 @@ func (c *Controller) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
}
}
sessionToken, _, err := c.store.CreateUserSession(user.Username, r.UserAgent(), realip.RealIP(r))
sessionToken, _, err := c.store.CreateUserSession(user.Username, r.UserAgent(), request.RealIP(r))
if err != nil {
html.ServerError(w, err)
return