summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--argv.go2
-rw-r--r--dumpClient.go150
-rw-r--r--http.go79
-rw-r--r--jsonClient.go108
-rw-r--r--main.go15
-rw-r--r--resources/goReference.svg1
6 files changed, 349 insertions, 6 deletions
diff --git a/argv.go b/argv.go
index 906dd65..6984b38 100644
--- a/argv.go
+++ b/argv.go
@@ -13,7 +13,7 @@ var argv args
type args struct {
ListRepos bool `arg:"--list-repos" help:"list all repositories"`
- Port int `arg:"--port" default:"2520" help:"port to run on"`
+ Port int `arg:"--port" default:"2520" help:"port to run on"`
}
func (args) Version() string {
diff --git a/dumpClient.go b/dumpClient.go
new file mode 100644
index 0000000..6c5c1af
--- /dev/null
+++ b/dumpClient.go
@@ -0,0 +1,150 @@
+package main
+
+import (
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "os"
+ "time"
+
+ "go.wit.com/log"
+)
+
+func dumpClient(accessf, clientf *os.File, r *http.Request) {
+ var host, url, proto, addr, agent string
+
+ host = r.Host
+ url = r.URL.String()
+ proto = r.Proto
+ addr = r.RemoteAddr
+ agent = r.UserAgent()
+
+ log.Warn(host, proto, addr, url, agent)
+
+ fmt.Fprintln(accessf, time.Now(), host, proto, addr, url, agent)
+ // return
+
+ fmt.Fprintln(clientf)
+ fmt.Fprintln(clientf, time.Now())
+ // Basic request information
+ fmt.Fprintln(clientf, "Method:", r.Method)
+ fmt.Fprintln(clientf, "URL:", r.URL)
+ fmt.Fprintln(clientf, "Protocol:", r.Proto)
+ fmt.Fprintln(clientf, "Host:", r.Host)
+ fmt.Fprintln(clientf, "Remote Address:", r.RemoteAddr)
+
+ // Headers
+ fmt.Fprintln(clientf, "Headers:")
+ for name, values := range r.Header {
+ for _, value := range values {
+ fmt.Fprintln(clientf, "Headers:", name, value)
+ }
+ }
+
+ // Query parameters
+ fmt.Fprintln(clientf, "Query Parameters:")
+ for param, values := range r.URL.Query() {
+ for _, value := range values {
+ fmt.Fprintln(clientf, "Query:", param, value)
+ }
+ }
+
+ // User-Agent
+ fmt.Fprintln(clientf, "User-Agent:", r.UserAgent())
+
+ // Content Length
+ fmt.Fprintln(clientf, "Content Length:", r.ContentLength)
+
+ // Cookies
+ fmt.Fprintln(clientf, "Cookies:")
+ for _, cookie := range r.Cookies() {
+ fmt.Fprintln(clientf, cookie.Name, cookie.Value)
+ }
+
+ // Request Body (if applicable)
+ if r.Body != nil {
+ body, err := ioutil.ReadAll(r.Body)
+ if err == nil {
+ fmt.Fprintln(clientf, "Body:", string(body))
+ }
+ }
+}
+
+func registerClient(f *os.File, r *http.Request) bool {
+ var host, url, proto, addr, agent string
+ var giturl, gopath string
+
+ host = r.Host
+ url = r.URL.String()
+ proto = r.Proto
+ addr = r.RemoteAddr
+ agent = r.UserAgent()
+
+ log.Warn(host, proto, addr, url, agent)
+
+ fmt.Fprintln(f, time.Now(), host, proto, addr, url, agent)
+ // return
+
+ fmt.Fprintln(f)
+ fmt.Fprintln(f, time.Now())
+ // Basic request information
+ fmt.Fprintln(f, "Method:", r.Method)
+ fmt.Fprintln(f, "URL:", r.URL)
+ fmt.Fprintln(f, "Protocol:", r.Proto)
+ fmt.Fprintln(f, "Host:", r.Host)
+ fmt.Fprintln(f, "Remote Address:", r.RemoteAddr)
+
+ // Headers
+ fmt.Fprintln(f, "Headers:")
+ for name, values := range r.Header {
+ for _, value := range values {
+ fmt.Fprintln(f, "Headers:", name, value)
+ if name == "Giturl" {
+ giturl = value
+ }
+ if name == "Gopath" {
+ gopath = value
+ }
+ // Giturl https://git.wit.org/gui/go-gui-toolkits.git
+ // Headers: Gopath
+ }
+ }
+
+ // Query parameters
+ fmt.Fprintln(f, "Query Parameters:")
+ for param, values := range r.URL.Query() {
+ for _, value := range values {
+ fmt.Fprintln(f, "Query:", param, value)
+ }
+ }
+
+ // User-Agent
+ fmt.Fprintln(f, "User-Agent:", r.UserAgent())
+
+ // Content Length
+ fmt.Fprintln(f, "Content Length:", r.ContentLength)
+
+ // Cookies
+ fmt.Fprintln(f, "Cookies:")
+ for _, cookie := range r.Cookies() {
+ fmt.Fprintln(f, cookie.Name, cookie.Value)
+ }
+
+ // Request Body (if applicable)
+ if r.Body != nil {
+ body, err := ioutil.ReadAll(r.Body)
+ if err == nil {
+ fmt.Fprintln(f, "Body:", string(body))
+ }
+ }
+
+ fmt.Fprintln(f, "gopath =", gopath, "giturl =", giturl)
+ if gopath == "" {
+ return false
+ }
+ if giturl == "" {
+ return false
+ }
+ fmt.Fprintln(f, "Sent back OK")
+ return true
+}
diff --git a/http.go b/http.go
new file mode 100644
index 0000000..19e1bb8
--- /dev/null
+++ b/http.go
@@ -0,0 +1,79 @@
+package main
+
+import (
+ "fmt"
+ "net/http"
+ "strings"
+
+ "go.wit.com/log"
+)
+
+// remove '?' part and trailing '/'
+func cleanURL(url string) string {
+ url = "/" + strings.Trim(url, "/")
+ return url
+}
+
+func okHandler(w http.ResponseWriter, r *http.Request) {
+ var tmp string
+ tmp = cleanURL(r.URL.Path)
+
+ if tmp == "/" {
+ fmt.Fprintln(w, "OK")
+ return
+ }
+ if tmp == "/me" {
+ j, err := dumpJsonClient(r)
+ if err != nil {
+ fmt.Fprintln(w, "BAD ZOOT")
+ return
+ }
+ fmt.Fprintln(w, j)
+ return
+ }
+ if tmp == "/favicon.ico" {
+ writeFile(w, "ipv6.png")
+ return
+ }
+ // used for uptime monitor checking
+ if tmp == "/uptime" {
+ writeFile(w, "uptime.html")
+ return
+ }
+ log.Warn("BAD URL =", tmp)
+ fmt.Fprintln(w, "BAD ZOOT")
+ // badurl(w, r.URL.String())
+ // fmt.Fprintln(w, "BAD", tmp)
+}
+
+func writeFile(w http.ResponseWriter, filename string) {
+ // fmt.Fprintln(w, "GOT TEST?")
+ fullname := "resources/" + filename
+ pfile, err := resources.ReadFile(fullname)
+ if err != nil {
+ log.Println("ERROR:", err)
+ // w.Write(pfile)
+ return
+ }
+
+ var repohtml string
+ repohtml = string(pfile)
+ if filename == "goReference.svg" {
+ w.Header().Set("Content-Type", "image/svg+xml")
+ }
+ fmt.Fprintln(w, repohtml)
+ log.Println("writeFile() found internal file:", filename)
+}
+
+// starts and sits waiting for HTTP requests
+func startHTTP() {
+ http.HandleFunc("/", okHandler)
+
+ p := fmt.Sprintf(":%d", argv.Port)
+ log.Println("Running on port", p)
+
+ err := http.ListenAndServe(p, nil)
+ if err != nil {
+ log.Println("Error starting server:", err)
+ }
+}
diff --git a/jsonClient.go b/jsonClient.go
new file mode 100644
index 0000000..4dc9b10
--- /dev/null
+++ b/jsonClient.go
@@ -0,0 +1,108 @@
+package main
+
+import (
+ "bytes"
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+)
+
+// RequestInfo holds the extracted data from http.Request
+type RequestInfo struct {
+ Host string `json:"host"`
+ URL string `json:"url"`
+ Proto string `json:"proto"`
+ Addr string `json:"addr"`
+ Agent string `json:"agent"`
+ Headers map[string][]string `json:"headers"`
+ Cookies map[string]string `json:"cookies"`
+ QueryParams map[string][]string `json:"queryParams"`
+ // Add other fields as needed
+ Body string `json:"body"`
+}
+
+// dumpClient returns a string with JSON formatted http.Request information
+func dumpJsonClient(r *http.Request) (string, error) {
+ // Extracting Cookies
+ cookieMap := make(map[string]string)
+ for _, cookie := range r.Cookies() {
+ cookieMap[cookie.Name] = cookie.Value
+ }
+
+ // Read the body (Ensure to do this first)
+ var bodyBytes []byte
+ if r.Body != nil { // Read the body if it's not nil
+ bodyBytes, _ = ioutil.ReadAll(r.Body)
+ r.Body.Close() // Close the body when done reading
+ r.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes)) // Reset the body
+ }
+
+ info := RequestInfo{
+ Host: r.Host,
+ URL: r.URL.String(),
+ Proto: r.Proto,
+ Addr: r.RemoteAddr,
+ Agent: r.UserAgent(),
+ Headers: r.Header,
+ Cookies: cookieMap,
+ QueryParams: r.URL.Query(),
+ Body: string(bodyBytes),
+ }
+
+ // Marshal the struct to a JSON string
+ jsonString, err := json.Marshal(info)
+ if err != nil {
+ return "", err // Return the error to the caller
+ }
+
+ var jsonData interface{}
+ err = json.Unmarshal([]byte(jsonString), &jsonData)
+ if err != nil {
+ return "", err // Return the error to the caller
+ }
+
+ formattedJSON, err := json.MarshalIndent(jsonData, "", " ")
+ if err != nil {
+ return "", err // Return the error to the caller
+ }
+
+ return string(formattedJSON), nil
+}
+
+/*
+package main
+
+import (
+ "bytes"
+ "encoding/json"
+ "io"
+ "io/ioutil"
+ "net/http"
+)
+
+type RequestInfo struct {
+ // ... (other fields)
+ Body string `json:"body"`
+ // ... (other fields)
+}
+
+func dumpClient(r *http.Request) (string, error) {
+ // ... (rest of your code to collect other request info)
+
+ info := RequestInfo{
+ // ... (other fields)
+ Body: string(bodyBytes),
+ // ... (other fields)
+ }
+
+ // Marshal the struct to a JSON string
+ jsonString, err := json.Marshal(info)
+ if err != nil {
+ return "", err
+ }
+
+ return string(jsonString), nil
+}
+
+// ... (rest of your code)
+*/
diff --git a/main.go b/main.go
index 577afab..b3057fb 100644
--- a/main.go
+++ b/main.go
@@ -15,6 +15,7 @@
package main
import (
+ "embed"
"flag"
"fmt"
"log"
@@ -27,6 +28,9 @@ import (
var Version string
+//go:embed resources/*
+var resources embed.FS
+
func main() {
flag.Parse()
@@ -59,10 +63,10 @@ func main() {
}
// fmt.Printf("\nStatus: %s\n", status)
/*
- if status == qemu.StatusRunning {
- // getBlockDevices(dom)
- // fmt.Println(name, status, err)
- }
+ if status == qemu.StatusRunning {
+ // getBlockDevices(dom)
+ // fmt.Println(name, status, err)
+ }
*/
blockDevices, err := dom.BlockDevices()
for _, blockDevice := range blockDevices {
@@ -79,6 +83,8 @@ func main() {
}
}
// fmt.Printf("\n***************************\n")
+
+ startHTTP()
}
func displayBlockDevices(domain *qemu.Domain) {
@@ -110,4 +116,3 @@ func displayPCIDevices(domain *qemu.Domain) {
fmt.Printf("[%10s] [%20s]\n", pciDevice.QdevID, pciDevice.ClassInfo.Desc)
}
}
-
diff --git a/resources/goReference.svg b/resources/goReference.svg
new file mode 100644
index 0000000..99e2d73
--- /dev/null
+++ b/resources/goReference.svg
@@ -0,0 +1 @@
+<svg width="90" height="20" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M2 0h26v20H2a2 2 0 01-2-2V2a2 2 0 012-2z" fill="#5C5C5C"/><path d="M87.99 0H28v20h59.99a2 2 0 002-2V2a2 2 0 00-2-2z" fill="#007D9C"/><path d="M35.177 14v-2.915c0-.374.072-.682.215-.924.142-.242.324-.423.544-.544.22-.122.444-.182.671-.182.169 0 .303.01.401.027.1.019.19.043.27.072l.165-1.034a.977.977 0 00-.275-.082 2.004 2.004 0 00-.33-.028c-.425 0-.783.093-1.072.28-.29.188-.508.46-.655.82l-.11-.99H34V14h1.177zm5.66.11c.542 0 1.019-.114 1.43-.341.41-.227.714-.543.912-.946l-.935-.44c-.14.257-.322.453-.55.589-.227.135-.52.203-.88.203-.33 0-.616-.073-.858-.22a1.439 1.439 0 01-.56-.649 2.169 2.169 0 01-.177-.655l-.004-.049h4.03c.01-.059.018-.124.025-.196l.008-.112c.008-.117.011-.242.011-.374 0-.484-.1-.918-.302-1.303a2.19 2.19 0 00-.87-.903c-.377-.216-.826-.324-1.347-.324-.528 0-.995.115-1.402.346a2.442 2.442 0 00-.957.99c-.231.43-.347.937-.347 1.524s.116 1.095.347 1.524c.23.429.555.759.973.99.418.23.902.346 1.452.346zm1.302-3.41h-2.895l.02-.115c.016-.068.033-.134.053-.197l.067-.183c.125-.293.303-.513.534-.66.23-.147.508-.22.83-.22.47 0 .829.156 1.078.468.156.194.255.437.296.728l.017.179zM46.32 14V9.424h1.75V8.5h-1.783v-.704c0-.27.064-.476.19-.617l.069-.065c.172-.14.409-.209.71-.209.131 0 .249.013.351.038a.927.927 0 01.275.116l.22-.847a1.06 1.06 0 00-.423-.192 2.516 2.516 0 00-.622-.072c-.293 0-.559.038-.797.115a1.68 1.68 0 00-.61.341c-.17.15-.296.336-.38.556-.085.22-.127.47-.127.748V8.5h-1.034v.924h1.034V14h1.177zm5.1.11c.543 0 1.02-.114 1.43-.341.411-.227.715-.543.913-.946l-.935-.44c-.139.257-.322.453-.55.589-.227.135-.52.203-.88.203-.33 0-.616-.073-.858-.22a1.439 1.439 0 01-.56-.649 2.169 2.169 0 01-.177-.655l-.004-.049h4.03c.01-.059.018-.124.025-.196l.008-.112c.008-.117.011-.242.011-.374 0-.484-.1-.918-.302-1.303a2.19 2.19 0 00-.869-.903c-.378-.216-.827-.324-1.348-.324-.528 0-.995.115-1.402.346a2.442 2.442 0 00-.957.99c-.231.43-.347.937-.347 1.524s.116 1.095.347 1.524c.231.429.555.759.973.99.418.23.902.346 1.452.346zm1.303-3.41h-2.895l.02-.115c.016-.068.033-.134.053-.197l.067-.183c.125-.293.303-.513.534-.66.231-.147.508-.22.83-.22.47 0 .83.156 1.078.468.156.194.255.437.296.728l.017.179zM56.53 14v-2.915c0-.374.072-.682.215-.924.143-.242.324-.423.544-.544.22-.122.444-.182.671-.182.17 0 .303.01.402.027.099.019.189.043.27.072l.164-1.034a.977.977 0 00-.275-.082 2.004 2.004 0 00-.33-.028c-.425 0-.782.093-1.072.28-.29.188-.508.46-.655.82l-.11-.99h-1V14h1.176zm5.66.11c.542 0 1.019-.114 1.43-.341.41-.227.715-.543.913-.946l-.935-.44c-.14.257-.323.453-.55.589-.228.135-.521.203-.88.203-.33 0-.616-.073-.858-.22a1.439 1.439 0 01-.561-.649 2.169 2.169 0 01-.176-.655l-.005-.049h4.03c.01-.059.019-.124.025-.196l.009-.112c.007-.117.01-.242.01-.374 0-.484-.1-.918-.302-1.303a2.19 2.19 0 00-.869-.903c-.377-.216-.827-.324-1.347-.324-.528 0-.996.115-1.403.346a2.442 2.442 0 00-.957.99c-.23.43-.346.937-.346 1.524s.115 1.095.346 1.524c.231.429.556.759.974.99.418.23.902.346 1.452.346zm1.303-3.41h-2.896l.021-.115c.015-.068.032-.134.052-.197l.068-.183c.124-.293.302-.513.533-.66.231-.147.508-.22.83-.22.47 0 .83.156 1.079.468.156.194.254.437.295.728l.018.179zM67.3 14v-2.926c0-.418.075-.752.225-1.001.15-.25.34-.43.567-.545.227-.113.462-.17.704-.17.337 0 .617.104.841.313.224.21.336.585.336 1.128V14h1.177v-3.564c0-.462-.092-.843-.275-1.144a1.74 1.74 0 00-.743-.676 2.387 2.387 0 00-1.05-.226c-.301 0-.585.048-.853.143a1.722 1.722 0 00-.693.457c-.116.125-.217.27-.3.433l-.017.037-.051-.96h-1.045V14H67.3zm8.043.11c.418 0 .788-.068 1.11-.204a2.19 2.19 0 00.81-.572c.215-.245.375-.533.478-.863l-1.067-.363c-.044.227-.127.42-.248.577a1.197 1.197 0 01-.456.364 1.54 1.54 0 01-.65.126c-.322 0-.6-.073-.835-.22a1.397 1.397 0 01-.54-.649c-.124-.286-.186-.634-.186-1.045 0-.418.06-.77.181-1.056.121-.286.299-.504.534-.655.234-.15.517-.225.847-.225.337 0 .61.09.82.27.208.18.36.438.456.775l1.11-.44c-.11-.3-.27-.568-.483-.803a2.148 2.148 0 00-.787-.545c-.312-.128-.687-.192-1.127-.192-.528 0-1 .114-1.414.341a2.386 2.386 0 00-.968.985c-.23.429-.346.94-.346 1.534 0 .594.115 1.105.346 1.534.231.43.556.758.974.985.418.227.898.341 1.44.341zm6.192 0c.543 0 1.02-.114 1.43-.341.411-.227.715-.543.913-.946l-.935-.44c-.139.257-.322.453-.55.589-.227.135-.52.203-.88.203-.33 0-.616-.073-.858-.22a1.439 1.439 0 01-.56-.649 2.169 2.169 0 01-.177-.655l-.004-.049h4.03c.01-.059.018-.124.025-.196l.008-.112c.008-.117.011-.242.011-.374 0-.484-.1-.918-.302-1.303a2.19 2.19 0 00-.87-.903c-.377-.216-.826-.324-1.347-.324-.528 0-.995.115-1.402.346a2.442 2.442 0 00-.957.99c-.231.43-.347.937-.347 1.524s.116 1.095.347 1.524c.23.429.555.759.973.99.418.23.902.346 1.452.346zm1.303-3.41h-2.895l.02-.115c.016-.068.033-.134.053-.197l.067-.183c.125-.293.303-.513.534-.66.23-.147.508-.22.83-.22.47 0 .83.156 1.078.468.156.194.255.437.296.728l.017.179zM6.358 8.736c-.035 0-.043-.017-.026-.044l.184-.236c.018-.026.061-.044.096-.044h3.13c.034 0 .043.026.026.053l-.15.227c-.017.027-.061.053-.087.053l-3.173-.009zm-1.323.806c-.035 0-.044-.017-.026-.043l.184-.237c.017-.026.061-.043.096-.043h3.996c.036 0 .053.026.044.052l-.07.21c-.009.035-.043.053-.079.053l-4.145.009zm2.121.807c-.035 0-.044-.026-.026-.053l.122-.219c.018-.026.053-.052.088-.052h1.753c.035 0 .052.026.052.061l-.017.21c0 .036-.035.062-.062.062l-1.91-.01zm9.097-1.77c-.552.14-.93.245-1.472.385-.132.035-.14.044-.255-.087-.13-.15-.227-.246-.411-.333-.553-.272-1.088-.193-1.587.13-.596.386-.902.956-.893 1.666.008.701.49 1.28 1.182 1.376.597.079 1.095-.131 1.49-.578.08-.097.149-.202.237-.325h-1.691c-.184 0-.228-.114-.167-.263.114-.271.324-.727.447-.955a.236.236 0 01.219-.14h3.19c-.017.237-.017.473-.053.71a3.737 3.737 0 01-.718 1.718c-.631.832-1.455 1.35-2.498 1.489-.858.114-1.656-.052-2.357-.577a2.753 2.753 0 01-1.113-1.947c-.114-.955.167-1.814.745-2.568.622-.814 1.446-1.332 2.454-1.515.823-.15 1.612-.053 2.322.429.465.307.797.727 1.017 1.236.052.078.017.123-.088.149m2.901 4.846c-.798-.018-1.525-.246-2.139-.771a2.749 2.749 0 01-.946-1.692c-.158-.99.114-1.866.71-2.646.64-.842 1.41-1.28 2.454-1.464.894-.157 1.735-.07 2.497.447.693.473 1.122 1.113 1.236 1.954.149 1.183-.192 2.147-1.008 2.971a4.014 4.014 0 01-2.103 1.122c-.237.044-.473.052-.701.08zm2.085-3.54c-.008-.114-.008-.202-.025-.29-.158-.868-.956-1.358-1.788-1.165-.816.183-1.341.7-1.534 1.524a1.444 1.444 0 00.806 1.657c.482.21.964.184 1.429-.052.692-.36 1.069-.92 1.113-1.674h-.001z" fill="#FAFAFA" fill-rule="nonzero"/></g></svg> \ No newline at end of file
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-04 20:08:58 +0000