对应0.42.0升级

.gitignore

@@ -2,4 +2,6 @@
 **/bin
 .idea
 **/*.log
-**/*.exe
+**/*.exe
+**/go.sum
+./frps-auth

auth.go

@@ -107,11 +107,8 @@ func SignMD5(text string) string {
 }
 
 func createSignKey() string {
-	id, err := uuid.NewV4()
-	if nil != err {
-		return uuid.NewV5(uuid.NamespaceURL, "frps-auth").String()
-	}
-	return id.String()
+	v4 := uuid.NewV4()
+	return v4.String()
 }
 
 func AddAuthServeHTTP(w http.ResponseWriter, r *http.Request) {

embed.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"embed"
+	"io/fs"
+	"net/http"
+)
+
+//go:embed static/*
+var embedFS embed.FS
+
+func getStaticFS(path string) http.FileSystem {
+	if path != "" {
+		return http.Dir(path)
+	} else {
+		staticFS, err := fs.Sub(embedFS, "static")
+		if err != nil {
+			panic(err)
+		}
+		return http.FS(staticFS)
+	}
+}

frps-auth.go

@@ -60,6 +60,7 @@ type AuthConfig struct {
 	Username string `ini:"username"`
 	Password string `ini:"password"`
 	Salt     string `ini:"salt"`
+	Static   string `ini:"static"`
 }
 
 var Config AuthConfig = AuthConfig{
@@ -68,6 +69,7 @@ var Config AuthConfig = AuthConfig{
 	Username: "admin",
 	Password: "admin",
 	Salt:     "admin",
+	Static:   "",
 }
 
 func init() {
@@ -103,13 +105,27 @@ type applyPortContent struct {
 	Subdomain string `json:"subdomain"`
 
 	Metas applyPortContentAuthMeta `json:"metas,omitempty"`
+
+	User applyPortContentUser `json:"user"`
+
+	PrivilegeKey string `json:"privilege_key"`
+
+	Timestamp int64 `json:"timestamp"`
 }
 
 type applyPortContentAuthMeta struct {
 	SignKey string `json:"auth_key"`
 	ValidTo string `json:"auth_valid_to"`
 }
 
+type applyPortContentUser struct {
+	User string `json:"user"`
+
+	RunId string `json:"run_id"`
+
+	Metas map[string]string `json:"metas"`
+}
+
 func ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Body == nil {
 		http.Error(w, "Please send a request body.", 400)
@@ -162,7 +178,7 @@ func ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			if ae.Disabled {
 				return errors.New("disabled")
 			}
-			if (time.Now().UnixNano() / 1e6) > ae.ValidTo {
+			if (time.Now().UnixNano() / int64(1e6)) > ae.ValidTo {
 				return errors.New(time.Now().Format("yyyy-MM-dd"))
 			}
 			return nil
@@ -195,7 +211,7 @@ func main() {
 	router.HandleFunc("/list-auth", ListAuthServeHTTP).Methods("POST")
 	router.HandleFunc("/get-auth/{id}", GetAuthServeHTTP).Methods("GET")
 	router.HandleFunc("/get-auth-config/{id}", GetAuthConfigServerHTTP).Methods("GET")
-	router.PathPrefix("/").Handler(MakeHttpGzipHandler(http.StripPrefix("/", http.FileServer(http.Dir("static/"))))).Methods("GET")
+	router.PathPrefix("/").Handler(MakeHttpGzipHandler(http.StripPrefix("/", http.FileServer(getStaticFS(Config.Static))))).Methods("GET")
 	addr := Config.Address
 	port := Config.Port
 

go.mod

@@ -0,0 +1,11 @@
+module github.com/dev-lluo/frps-auth
+
+go 1.16
+
+require (
+	github.com/gorilla/mux v1.8.0
+	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
+	github.com/satori/go.uuid v1.2.0
+	github.com/xujiajun/nutsdb v0.9.0
+	gopkg.in/ini.v1 v1.66.6
+)