cristiancmoises
/
gophish
mirror of https://github.com/gophish/gophish
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added support for X-Forwarded-For. Fixes #203

pull/207/head
Jordan Wright 2016-03-10 18:54:30 -06:00
parent d5bf800961
commit c979dbd58d
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
controllers/route.go
View File

@ -9,6 +9,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"strings"
"github.com/gophish/gophish/auth" "github.com/gophish/gophish/auth"
mid "github.com/gophish/gophish/middleware" mid "github.com/gophish/gophish/middleware"
@ -94,11 +95,13 @@ func PhishTracker(w http.ResponseWriter, r *http.Request) {
r.ParseForm() r.ParseForm()
id := r.Form.Get("rid") id := r.Form.Get("rid")
if id == "" { if id == "" {
Logger.Println("Missing Result ID")
http.NotFound(w, r) http.NotFound(w, r)
return return
} }
rs, err := models.GetResult(id) rs, err := models.GetResult(id)
if err != nil { if err != nil {
Logger.Println("No Results found")
http.NotFound(w, r) http.NotFound(w, r)
return return
} }
@ -117,14 +120,18 @@ func PhishTracker(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
Logger.Println(err) Logger.Println(err)
} }
// Update the GeoIP information
ip, _, err := net.SplitHostPort(r.RemoteAddr) ip, _, err := net.SplitHostPort(r.RemoteAddr)
if err == nil { if err != nil {
err = rs.UpdateGeo(ip) Logger.Println(err)
if err != nil { return
Logger.Println(err) }
} // Respect X-Forwarded headers
} else { if fips := r.Header.Get("X-Forwarded-For"); fips != "" {
ip = strings.Split(fips, ", ")[0]
}
// Handle post processing such as GeoIP
err = rs.UpdateGeo(ip)
if err != nil {
Logger.Println(err) Logger.Println(err)
} }
w.Write([]byte("")) w.Write([]byte(""))
@ -407,6 +414,7 @@ func Logout(w http.ResponseWriter, r *http.Request) {
func Preview(w http.ResponseWriter, r *http.Request) { func Preview(w http.ResponseWriter, r *http.Request) {
if r.Method != "POST" { if r.Method != "POST" {
http.Error(w, "Method not allowed", http.StatusBadRequest) http.Error(w, "Method not allowed", http.StatusBadRequest)
return
} }
fmt.Fprintf(w, "%s", r.FormValue("html")) fmt.Fprintf(w, "%s", r.FormValue("html"))
} }
@ -416,6 +424,7 @@ func Clone(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
if r.Method != "POST" { if r.Method != "POST" {
http.Error(w, "Method not allowed", http.StatusBadRequest) http.Error(w, "Method not allowed", http.StatusBadRequest)
return
} }
if url, ok := vars["url"]; ok { if url, ok := vars["url"]; ok {
Logger.Println(url) Logger.Println(url)