apps/openlan
1
0
Fork 0
mirror of https://github.com/luscis/openlan.git synced 2025-10-09 18:40:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fea: add user for http proxy.
Some checks are pending
Coverage CI / build (push) Waiting to run
Details
CodeQL / Analyze (go) (push) Waiting to run
Details
Ubuntu CI / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Daniel Ding
2025-01-01 11:17:02 +08:00
parent 600b1f91d1
commit 6733a719e0
4 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/switch/main.go
View File

@@ -4,7 +4,7 @@ import (
"github.com/luscis/openlan/pkg/cache" "github.com/luscis/openlan/pkg/cache"
"github.com/luscis/openlan/pkg/config" "github.com/luscis/openlan/pkg/config"
"github.com/luscis/openlan/pkg/libol" "github.com/luscis/openlan/pkg/libol"
"github.com/luscis/openlan/pkg/switch" cswitch "github.com/luscis/openlan/pkg/switch"
) )
func main() { func main() {
@@ -12,7 +12,6 @@ func main() {
config.Update(c) config.Update(c)
libol.SetLogger(c.Log.File, c.Log.Verbose) libol.SetLogger(c.Log.File, c.Log.Verbose)
libol.Debug("main %s", c)
cache.Init(&c.Perf) cache.Init(&c.Perf)
s := cswitch.NewSwitch(c) s := cswitch.NewSwitch(c)
libol.PreNotify() libol.PreNotify()

10
pkg/config/proxy.go
View File

@@ -67,12 +67,14 @@ func (h *HttpProxy) Correct() {
if h.Cert != nil { if h.Cert != nil {
h.Cert.Correct() h.Cert.Correct()
} }
if h.Password != "" { if h.Password == "" {
h.Password = path.Join(h.ConfDir, h.Password) h.Password = h.Listen + ".pass"
} }
if h.CaCert != "" { h.Password = path.Join(h.ConfDir, h.Password)
h.CaCert = path.Join(h.ConfDir, h.CaCert) if h.CaCert == "" {
h.CaCert = "ca.crt"
} }
h.CaCert = path.Join(h.ConfDir, h.CaCert)
} }
func (h *HttpProxy) FindMatch(domain string, to *HttpForward) int { func (h *HttpProxy) FindMatch(domain string, to *HttpForward) int {

4
pkg/libol/utils_test.go
View File

@@ -1,9 +1,9 @@
package libol package libol
import ( import (
"bytes"
"github.com/stretchr/testify/assert"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func TestPrettyTime(t *testing.T) { func TestPrettyTime(t *testing.T) {

60
pkg/proxy/http.go
View File

@@ -9,10 +9,10 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net" "net"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
"os"
"regexp" "regexp"
"sort" "sort"
"strings" "strings"
@@ -146,6 +146,8 @@ func (t *HttpProxy) loadUrl() {
t.api.HandleFunc("/api/config", t.GetConfig).Methods("GET") t.api.HandleFunc("/api/config", t.GetConfig).Methods("GET")
t.api.HandleFunc("/api/match/{domain}/to/{backend}", t.AddMatch).Methods("POST") t.api.HandleFunc("/api/match/{domain}/to/{backend}", t.AddMatch).Methods("POST")
t.api.HandleFunc("/api/match/{domain}/to/{backend}", t.DelMatch).Methods("DELETE") t.api.HandleFunc("/api/match/{domain}/to/{backend}", t.DelMatch).Methods("DELETE")
t.api.HandleFunc("/api/user/{user}/{pass}", t.AddUser).Methods("POST")
t.api.HandleFunc("/api/user/{user}", t.DelUser).Methods("DELETE")
t.api.HandleFunc("/pac", t.GetPac).Methods("GET") t.api.HandleFunc("/pac", t.GetPac).Methods("GET")
} }
t.api.NotFoundHandler = http.HandlerFunc(NotFound) t.api.NotFoundHandler = http.HandlerFunc(NotFound)
@@ -153,7 +155,7 @@ func (t *HttpProxy) loadUrl() {
func (t *HttpProxy) loadPass() { func (t *HttpProxy) loadPass() {
file := t.cfg.Password file := t.cfg.Password
if file == "" { if file == "" || libol.FileExist(file) != nil {
return return
} }
reader, err := libol.OpenRead(file) reader, err := libol.OpenRead(file)
@@ -178,6 +180,19 @@ func (t *HttpProxy) loadPass() {
} }
} }
func (t *HttpProxy) savePass() error {
file := t.cfg.Password
writer, err := libol.OpenTrunk(file)
if err != nil {
return err
}
for user, pass := range t.pass {
line := user + ":" + pass
_, _ = writer.WriteString(line + "\n")
}
return nil
}
func (t *HttpProxy) isAuth(username, password string) bool { func (t *HttpProxy) isAuth(username, password string) bool {
if p, ok := t.pass[username]; ok { if p, ok := t.pass[username]; ok {
return p == password return p == password
@@ -254,10 +269,10 @@ func (t *HttpProxy) openConn(protocol, remote string, insecure bool) (net.Conn,
InsecureSkipVerify: insecure, InsecureSkipVerify: insecure,
} }
caFile := t.cfg.CaCert caFile := t.cfg.CaCert
if caFile != "" { if caFile != "" && libol.FileExist(caFile) == nil {
caCertPool := x509.NewCertPool() caCertPool := x509.NewCertPool()
// Load CA cert // Load CA cert
caCert, err := ioutil.ReadFile(caFile) caCert, err := os.ReadFile(caFile)
if err != nil { if err != nil {
t.out.Warn("HttpProxy.openConn %s", err) t.out.Warn("HttpProxy.openConn %s", err)
} else { } else {
@@ -457,7 +472,7 @@ var httpTmpl = map[string]string{
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>OpenLAN Proxy</title> <title>OpenLAN Ceci</title>
<style> <style>
body, table, a { body, table, a {
background-color: #1d1d1d; background-color: #1d1d1d;
@@ -574,10 +589,39 @@ func (t *HttpProxy) AddMatch(w http.ResponseWriter, r *http.Request) {
} else { } else {
encodeYaml(w, "failed") encodeYaml(w, "failed")
} }
t.Save() t.save()
} }
func (t *HttpProxy) Save() { func (t *HttpProxy) AddUser(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
user := vars["user"]
pass := vars["pass"]
t.lock.Lock()
defer t.lock.Unlock()
t.pass[user] = pass
encodeYaml(w, "success")
t.savePass()
}
func (t *HttpProxy) DelUser(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
user := vars["user"]
t.lock.Lock()
defer t.lock.Unlock()
if _, ok := t.pass[user]; ok {
delete(t.pass, user)
}
encodeYaml(w, "success")
t.savePass()
}
func (t *HttpProxy) save() {
if t.proxer == nil { if t.proxer == nil {
t.cfg.Save() t.cfg.Save()
} else { } else {
@@ -599,7 +643,7 @@ func (t *HttpProxy) DelMatch(w http.ResponseWriter, r *http.Request) {
} else { } else {
encodeYaml(w, "failed") encodeYaml(w, "failed")
} }
t.Save() t.save()
} }
func (t *HttpProxy) GetPac(w http.ResponseWriter, r *http.Request) { func (t *HttpProxy) GetPac(w http.ResponseWriter, r *http.Request) {