pixeldrain/fnx_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly set remote user address

Browse Source
This commit is contained in:
Wim Brand
2019-06-05 00:12:00 +02:00
parent ccd0f82ad3
commit a58d9218e6
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pixelapi/pixelapi.go
View File

@@ -17,11 +17,12 @@ var client = &http.Client{}
type PixelAPI struct {
apiEndpoint string
apiKey string
RealIP string
}
// New creates a new Pixeldrain API client to query the Pixeldrain API with
func New(apiEndpoint, apiKey string) *PixelAPI {
return &PixelAPI{apiEndpoint, apiKey}
return &PixelAPI{apiEndpoint, apiKey, ""}
}
// Error is either an error that occurred during the API request
@@ -61,6 +62,9 @@ func (p *PixelAPI) jsonRequest(method, url string, target interface{}) error {
if p.apiKey != "" {
req.SetBasicAuth("", p.apiKey)
}
if p.RealIP != "" {
req.Header.Set("X-Real-IP", p.RealIP)
}
resp, err := client.Do(req)
if err != nil {
@@ -84,6 +88,9 @@ func (p *PixelAPI) getString(url string) (string, error) {
if p.apiKey != "" {
req.SetBasicAuth("", p.apiKey)
}
if p.RealIP != "" {
req.Header.Set("X-Real-IP", p.RealIP)
}
resp, err := client.Do(req)
if err != nil {
@@ -105,6 +112,9 @@ func (p *PixelAPI) getRaw(url string) (io.ReadCloser, error) {
if p.apiKey != "" {
req.SetBasicAuth("", p.apiKey)
}
if p.RealIP != "" {
req.Header.Set("X-Real-IP", p.RealIP)
}
resp, err := client.Do(req)
if err != nil {
@@ -133,6 +143,9 @@ func (p *PixelAPI) form(
if p.apiKey != "" {
req.SetBasicAuth("", p.apiKey)
}
if p.RealIP != "" {
req.Header.Set("X-Real-IP", p.RealIP)
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")

5
webcontroller/file_preview.go
View File

@@ -10,6 +10,7 @@ import (
"path/filepath"
"strings"
"fornaxian.com/pixeldrain-api/util"
"fornaxian.com/pixeldrain-web/pixelapi"
"github.com/Fornaxian/log"
@@ -23,7 +24,9 @@ func (wc *WebController) serveFilePreview(w http.ResponseWriter, r *http.Request
serveFilePreviewDemo(w) // Required for a-ads.com quality check
return
}
var api = pixelapi.New(wc.conf.APIURLInternal, "")
apikey, _ := wc.getAPIKey(r)
var api = pixelapi.New(wc.conf.APIURLInternal, apikey)
api.RealIP = util.RemoteAddress(r)
inf, err := api.GetFileInfo(p.ByName("id"), "?should_a_view_be_added=yes_gimme") // TODO: Error handling
if err != nil {
wc.serveNotFound(w, r)