update
parent
8432135f3d
commit
f654cd347c
16
api.go
16
api.go
|
@ -107,15 +107,19 @@ func LoadConfig(w http.ResponseWriter, r *http.Request) {
|
|||
w.Write([]byte("ok"))
|
||||
}
|
||||
|
||||
func GetConfig(w http.ResponseWriter, r *http.Request) {
|
||||
config := []configui.File{}
|
||||
for _, f := range files {
|
||||
config = append(config, *f)
|
||||
}
|
||||
data, err := json.Marshal(config)
|
||||
func getConfigHandler(w http.ResponseWriter, r *http.Request) {
|
||||
data, err := GetConfig()
|
||||
if err != nil {
|
||||
HttpWriter(w, 500, err.Error())
|
||||
return
|
||||
}
|
||||
w.Write(data)
|
||||
}
|
||||
|
||||
func GetConfig() ([]byte, error) {
|
||||
config := []configui.File{}
|
||||
for _, f := range files {
|
||||
config = append(config, *f)
|
||||
}
|
||||
return json.Marshal(config)
|
||||
}
|
||||
|
|
25
main.go
25
main.go
|
@ -1,7 +1,6 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"embed"
|
||||
"flag"
|
||||
"fmt"
|
||||
|
@ -13,6 +12,7 @@ import (
|
|||
"time"
|
||||
|
||||
"kumoly.io/tools/configui/configui"
|
||||
"kumoly.io/tools/configui/public"
|
||||
)
|
||||
|
||||
//go:embed templates
|
||||
|
@ -27,6 +27,7 @@ var (
|
|||
|
||||
flagBind string
|
||||
flagLogFile string
|
||||
flagAllow string
|
||||
flagVer bool
|
||||
)
|
||||
|
||||
|
@ -42,6 +43,7 @@ func init() {
|
|||
flag.StringVar(&flagAlias, "n", "", "alias of file")
|
||||
flag.StringVar(&flagAction, "c", "", "cmd to apply")
|
||||
flag.StringVar(&flagLogFile, "log", "", "log to file")
|
||||
flag.StringVar(&flagAllow, "allow", "", "IPs to allow, blank to allow all")
|
||||
flag.StringVar(&flagBind, "bind", "localhost:8000", "address to bind")
|
||||
flag.BoolVar(&flagVer, "v", false, "show version")
|
||||
flag.Usage = func() {
|
||||
|
@ -96,7 +98,7 @@ func main() {
|
|||
mux := http.NewServeMux()
|
||||
mux.HandleFunc("/api/conf", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method == "GET" {
|
||||
GetConfig(w, r)
|
||||
getConfigHandler(w, r)
|
||||
} else if r.Method == "POST" {
|
||||
LoadConfig(w, r)
|
||||
} else {
|
||||
|
@ -133,28 +135,15 @@ func main() {
|
|||
w.WriteHeader(404)
|
||||
}
|
||||
})
|
||||
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path != "/" {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
buf := &bytes.Buffer{}
|
||||
err := tmpl.ExecuteTemplate(buf, "home", nil)
|
||||
if err != nil {
|
||||
w.WriteHeader(500)
|
||||
w.Write([]byte(err.Error()))
|
||||
} else {
|
||||
w.Write(buf.Bytes())
|
||||
}
|
||||
})
|
||||
|
||||
mux.Handle("/public/", http.StripPrefix("/public/", http.FileServer(http.FS(public.FS))))
|
||||
tmpl = template.Must(template.New("").ParseFS(tmplFS, "templates/*.tmpl", "templates/**/*.tmpl"))
|
||||
|
||||
setRoutes(mux)
|
||||
server := &http.Server{
|
||||
Addr: flagBind,
|
||||
WriteTimeout: time.Second * 3,
|
||||
ReadTimeout: time.Second * 30,
|
||||
Handler: LogMiddleware(mux),
|
||||
Handler: Middleware(mux),
|
||||
}
|
||||
|
||||
// start server
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
package public
|
||||
|
||||
import "embed"
|
||||
|
||||
//go:embed js css
|
||||
var FS embed.FS
|
|
@ -0,0 +1,42 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func setRoutes(mux *http.ServeMux) {
|
||||
|
||||
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path != "/" {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
Files := []string{}
|
||||
for file := range files {
|
||||
Files = append(Files, files[file].Alias)
|
||||
}
|
||||
|
||||
contentB, err := GetConfig()
|
||||
content := ""
|
||||
if err != nil {
|
||||
content = err.Error()
|
||||
} else {
|
||||
content = string(contentB)
|
||||
}
|
||||
|
||||
data := struct {
|
||||
Active string
|
||||
Files []string
|
||||
Content string
|
||||
Lang string
|
||||
}{
|
||||
Files: Files,
|
||||
Active: "ConfigUI",
|
||||
Content: content,
|
||||
Lang: "json",
|
||||
}
|
||||
|
||||
serve(w, "home", data)
|
||||
})
|
||||
}
|
|
@ -1,6 +1,9 @@
|
|||
{{define "base/footer"}}
|
||||
<script src="/public/js/main.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
|
||||
<!-- <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script> -->
|
||||
|
||||
<script src="public/js/prism1.23.0.min.js"></script>
|
||||
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.23.0/prism.min.js"></script> -->
|
||||
</body>
|
||||
</html>
|
||||
{{end}}
|
|
@ -4,8 +4,10 @@
|
|||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Serviced</title>
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css">
|
||||
<title>ConfigUI</title>
|
||||
<link rel="stylesheet" href="/public/css/bulma0.9.3.min.css">
|
||||
<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css"> -->
|
||||
<link rel="stylesheet" href="/public/css/main.css">
|
||||
</head>
|
||||
<body>
|
||||
{{end}}
|
|
@ -1,14 +1,54 @@
|
|||
{{define "home"}}
|
||||
{{template "base/header" .}}
|
||||
<section class="section">
|
||||
<div class="container">
|
||||
<h1 class="title">
|
||||
Hello World
|
||||
</h1>
|
||||
<p class="subtitle">
|
||||
My first website with <strong>Bulma</strong>!
|
||||
</p>
|
||||
|
||||
<div class="columns is-mobile is-centered">
|
||||
<div class="column is-half">
|
||||
<section class="section">
|
||||
<container class="container is-max-desktop">
|
||||
<h1 class="title">ConfigUI</h1>
|
||||
</container>
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<div class="tile is-ancestor mx-2">
|
||||
<div class="tile is-3 is-vertical is-parent">
|
||||
<div class="tile is-child box">
|
||||
<section class="is-large">
|
||||
<aside class="menu">
|
||||
<p class="menu-label">
|
||||
Files
|
||||
</p>
|
||||
<ul class="menu-list">
|
||||
{{ range .Files }}
|
||||
<li><a>{{ . }}</a></li>
|
||||
{{ end }}
|
||||
</ul>
|
||||
<p class="menu-label">
|
||||
ConfigUI
|
||||
</p>
|
||||
<ul class="menu-list">
|
||||
<li><a{{if eq .Active "ConfigUI"}} class="is-active"{{end}}>config.json</a></li>
|
||||
</ul>
|
||||
</aside>
|
||||
</section>
|
||||
</div>
|
||||
<div class="tile is-child box">
|
||||
<p class="title">Two</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tile is-parent">
|
||||
<div class="tile is-child box">
|
||||
<p class="title">Three</p>
|
||||
<textarea class="content" placeholder="Enter HTML Source Code" id="editing" spellcheck="false" oninput="update(this.value); sync_scroll(this);" onscroll="sync_scroll(this);" onkeydown="check_tab(this, event);"></textarea>
|
||||
<pre id="highlighting" aria-hidden="true">
|
||||
<code class="language-html" id="highlighting-content">{{.Content}}</code>
|
||||
</pre>
|
||||
|
||||
<!-- <code-input class="content" id="edit" lang="{{.Lang}}" name="config">{{.Content}}</code-input> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{template "base/footer" .}}
|
||||
{{end}}
|
46
util.go
46
util.go
|
@ -2,15 +2,17 @@ package main
|
|||
|
||||
import (
|
||||
"archive/tar"
|
||||
"bytes"
|
||||
"compress/gzip"
|
||||
"io"
|
||||
"log"
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func LogMiddleware(next http.Handler) http.Handler {
|
||||
func Middleware(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(
|
||||
func(w http.ResponseWriter, r *http.Request) {
|
||||
defer func() {
|
||||
|
@ -20,8 +22,18 @@ func LogMiddleware(next http.Handler) http.Handler {
|
|||
w.WriteHeader(500)
|
||||
}
|
||||
}()
|
||||
next.ServeHTTP(w, r)
|
||||
log.Printf("%s %s %s %s\n", r.RemoteAddr, r.Method, r.URL, r.Header.Get("User-Agent"))
|
||||
abort := false
|
||||
if flagAllow != "" {
|
||||
if GetIP(r) != flagAllow {
|
||||
HttpWriter(w, 403, "permission denyed")
|
||||
abort = true
|
||||
}
|
||||
}
|
||||
|
||||
if !abort {
|
||||
next.ServeHTTP(w, r)
|
||||
}
|
||||
log.Printf("%s %s %s %s\n", GetIP(r), r.Method, r.URL, r.Header.Get("User-Agent"))
|
||||
},
|
||||
)
|
||||
}
|
||||
|
@ -88,3 +100,31 @@ func HttpWriter(w http.ResponseWriter, status int, errStr string) {
|
|||
w.WriteHeader(status)
|
||||
w.Write([]byte(errStr))
|
||||
}
|
||||
|
||||
func GetIP(r *http.Request) string {
|
||||
ip := r.Header.Get("X-Real-Ip")
|
||||
if ip == "" {
|
||||
ips := r.Header.Get("X-Forwarded-For")
|
||||
ipArr := strings.Split(ips, ",")
|
||||
ip = strings.Trim(ipArr[len(ipArr)-1], " ")
|
||||
}
|
||||
if ip == "" {
|
||||
var err error
|
||||
ip, _, err = net.SplitHostPort(r.RemoteAddr)
|
||||
if err != nil {
|
||||
ip = r.RemoteAddr
|
||||
}
|
||||
}
|
||||
return ip
|
||||
}
|
||||
|
||||
func serve(w http.ResponseWriter, name string, data interface{}) error {
|
||||
buf := &bytes.Buffer{}
|
||||
err := tmpl.ExecuteTemplate(buf, "home", data)
|
||||
if err != nil {
|
||||
HttpWriter(w, 500, err.Error())
|
||||
return err
|
||||
}
|
||||
_, err = w.Write(buf.Bytes())
|
||||
return err
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue