Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38f19408c2 | ||
|
|
f28211e722 | ||
|
|
ef3abbbf07 |
Binary file not shown.
Binary file not shown.
@@ -41,6 +41,10 @@ func GetAuth() (string, string, bool) {
|
||||
return user, pass, user != "" && pass != ""
|
||||
}
|
||||
|
||||
func GetTrim() string {
|
||||
return conf.Get("trim").GetString()
|
||||
}
|
||||
|
||||
func GetPort() string {
|
||||
port := conf.Get("p").GetInt()
|
||||
return ":" + fmt.Sprint(port)
|
||||
|
||||
@@ -47,6 +47,7 @@ func parseArgs() (*args.ArgSet, error) {
|
||||
as.Append(args.BOOL, "compress", "enable compression", true)
|
||||
as.Append(args.STRING, "crt", "path to crt for ssl", "")
|
||||
as.Append(args.STRING, "key", "path to key for ssl", "")
|
||||
as.Append(args.STRING, "trim", "path prefix to trim, like '/abc' to change '/abc/def' to '/def'", "")
|
||||
as.Append(args.STRING, "tcp", "address for tcp only tunnel", "")
|
||||
as.Append(args.DURATION, "timeout", "timeout for tunnel", time.Minute)
|
||||
as.Append(args.STRING, "proxy", "double-comma separated (+ if auth)from,scheme://to.tld:port,,", "")
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"bytes"
|
||||
"crypto/tls"
|
||||
"io"
|
||||
"local/rproxy3/config"
|
||||
"local/rproxy3/storage/packable"
|
||||
"log"
|
||||
"net/http"
|
||||
@@ -25,6 +26,7 @@ type rewrite struct {
|
||||
|
||||
func (s *Server) Proxy(w http.ResponseWriter, r *http.Request) {
|
||||
newURL, err := s.lookup(mapKey(r.Host))
|
||||
r.URL.Path = strings.TrimPrefix(r.URL.Path, config.GetTrim())
|
||||
var transport http.RoundTripper
|
||||
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
|
||||
transport = &redirPurge{
|
||||
@@ -69,6 +71,8 @@ func (rp *redirPurge) RoundTrip(r *http.Request) (*http.Response, error) {
|
||||
if loc := resp.Header.Get("Location"); loc != "" {
|
||||
resp.Header.Set("Location", strings.Replace(loc, rp.targetHost, rp.proxyHost, 1))
|
||||
}
|
||||
// google floc https://paramdeo.com/blog/opting-your-website-out-of-googles-floc-network
|
||||
resp.Header.Set("Permissions-Policy", "interest-cohort=()")
|
||||
return resp, err
|
||||
}
|
||||
|
||||
|
||||
@@ -115,6 +115,7 @@ func (s *Server) doAuthelia(foo http.HandlerFunc) http.HandlerFunc {
|
||||
panic(fmt.Sprintf("bad config for authelia url: %v", err))
|
||||
}
|
||||
url.Path = "/api/verify"
|
||||
logb.Verbosef("authelia @ %s", url.String())
|
||||
req, err := http.NewRequest(http.MethodGet, url.String(), nil)
|
||||
if err != nil {
|
||||
panic(err.Error())
|
||||
@@ -134,11 +135,13 @@ func (s *Server) doAuthelia(foo http.HandlerFunc) http.HandlerFunc {
|
||||
"X-Forwarded-Uri": r2.URL.String(),
|
||||
} {
|
||||
if _, ok := httpreq.Header[k]; !ok {
|
||||
logb.Verbosef("authelia header setting %s:%s", k, v)
|
||||
httpreq.Header.Set(k, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
if cookie, err := r.Cookie("authelia_session"); err == nil {
|
||||
logb.Verbosef("authelia session found in cookies; %+v", cookie)
|
||||
req.AddCookie(cookie)
|
||||
}
|
||||
c := &http.Client{
|
||||
@@ -149,6 +152,7 @@ func (s *Server) doAuthelia(foo http.HandlerFunc) http.HandlerFunc {
|
||||
}
|
||||
|
||||
autheliaKey := mapKey(req.Host)
|
||||
logb.Verbosef("request to %s is authelia %s? %v", r.Host, autheliaKey, strings.HasPrefix(r.Host, autheliaKey))
|
||||
if strings.HasPrefix(r.Host, autheliaKey) {
|
||||
logb.Debugf("no authelia for %s because it has prefix %s", r.Host, autheliaKey)
|
||||
foo(w, r)
|
||||
@@ -176,13 +180,13 @@ func (s *Server) doAuthelia(foo http.HandlerFunc) http.HandlerFunc {
|
||||
Name: k,
|
||||
Value: resp.Header.Get(k),
|
||||
Path: "/",
|
||||
Domain: r2.Host,
|
||||
SameSite: http.SameSiteLaxMode,
|
||||
Secure: true,
|
||||
HttpOnly: true,
|
||||
Expires: time.Now().Add(24 * time.Hour * 30),
|
||||
}
|
||||
logb.Verbosef("setting authelia cookie in response: %+v", cookie)
|
||||
http.SetCookie(w, cookie)
|
||||
logb.Verbosef("setting authelia cookie in request: %+v", cookie)
|
||||
r.AddCookie(cookie)
|
||||
}
|
||||
}
|
||||
foo(w, r)
|
||||
@@ -192,6 +196,7 @@ func (s *Server) doAuthelia(foo http.HandlerFunc) http.HandlerFunc {
|
||||
q := url.Query()
|
||||
q.Set("rd", r2.URL.String())
|
||||
url.RawQuery = q.Encode()
|
||||
logb.Verbosef("authelia status %d, rd'ing %s", resp.StatusCode, url.String())
|
||||
http.Redirect(w, r, url.String(), http.StatusFound)
|
||||
}
|
||||
}
|
||||
@@ -264,12 +269,15 @@ func (s *Server) Pre(foo http.HandlerFunc) http.HandlerFunc {
|
||||
w.WriteHeader(http.StatusTooManyRequests)
|
||||
return
|
||||
}
|
||||
if did := s.doCORS(w, r); did {
|
||||
w, did := s.doCORS(w, r)
|
||||
if did {
|
||||
return
|
||||
}
|
||||
if s.auth.BOAuthZ {
|
||||
logb.Verbosef("doing boauthz for request to %s", r.URL.String())
|
||||
s.doBOAuthZ(foo)(w, r)
|
||||
} else if s.auth.Authelia {
|
||||
logb.Verbosef("doing authelia for request to %s", r.URL.String())
|
||||
s.doAuthelia(foo)(w, r)
|
||||
} else {
|
||||
foo(w, r)
|
||||
@@ -281,20 +289,29 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||
s.Pre(s.Proxy)(w, r)
|
||||
}
|
||||
|
||||
func (s *Server) doCORS(w http.ResponseWriter, r *http.Request) bool {
|
||||
type corsResponseWriter struct {
|
||||
http.ResponseWriter
|
||||
}
|
||||
|
||||
func (cb corsResponseWriter) WriteHeader(code int) {
|
||||
cb.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
cb.Header().Set("Access-Control-Allow-Headers", "X-Auth-Token, content-type, Content-Type")
|
||||
cb.ResponseWriter.WriteHeader(code)
|
||||
}
|
||||
|
||||
func (s *Server) doCORS(w http.ResponseWriter, r *http.Request) (http.ResponseWriter, bool) {
|
||||
key := mapKey(r.Host)
|
||||
if !config.GetCORS(key) {
|
||||
return false
|
||||
return w, false
|
||||
}
|
||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||
w.Header().Set("Access-Control-Allow-Headers", "X-Auth-Token, content-type, Content-Type")
|
||||
w = corsResponseWriter{ResponseWriter: w}
|
||||
if r.Method != "OPTIONS" {
|
||||
return false
|
||||
return w, false
|
||||
}
|
||||
w.Header().Set("Content-Length", "0")
|
||||
w.Header().Set("Content-Type", "text/plain")
|
||||
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, OPTIONS, TRACE, PATCH, HEAD, DELETE")
|
||||
return true
|
||||
return w, true
|
||||
}
|
||||
|
||||
func getProxyAuth(r *http.Request) (string, string) {
|
||||
|
||||
Reference in New Issue
Block a user