From 1336b77ea0fc422ae6d4d01ccb8133cdcc8108f6 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Sat, 16 Apr 2022 17:48:31 -0230 Subject: initial commit --- index.html | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..39a00d6 --- /dev/null +++ b/index.html @@ -0,0 +1,6 @@ + + + +

Hello, world!

+ + -- cgit v1.2.3 From fefe7774c5b75f8a1c8923a7c394e6f025223e5e Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Sun, 17 Apr 2022 15:42:22 -0230 Subject: server, navbar, style --- Makefile | 14 ++++++ go.mod | 3 ++ htdocs/base.html | 29 +++++++++++++ htdocs/index.html | 3 ++ htdocs/software/index.html | 7 +++ htdocs/style.css | 29 +++++++++++++ index.html | 6 --- server.go | 106 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 Makefile create mode 100644 go.mod create mode 100644 htdocs/base.html create mode 100644 htdocs/index.html create mode 100644 htdocs/software/index.html create mode 100644 htdocs/style.css delete mode 100644 index.html create mode 100644 server.go diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5add856 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +build: tidy format + go build + +serve: tidy format + go run . + +live: + rsync -rtvzP ./htdocs/ sam@samanthony.xyz:/var/www/htdocs/samanthony.xyz/ + +format: + gofmt -s -w . + +tidy: + go mod tidy diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..ace7593 --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module git.samanthony.xyz/samanthony.xyz + +go 1.18 diff --git a/htdocs/base.html b/htdocs/base.html new file mode 100644 index 0000000..5c02174 --- /dev/null +++ b/htdocs/base.html @@ -0,0 +1,29 @@ + + + + + + + {{ define "title" }}samanthony.xyz{{ end }} + {{ template "title" }} + + + {{ define "style" }}{{ end }} + {{ template "style" }} + + + + + {{ template "body_content" }} + + diff --git a/htdocs/index.html b/htdocs/index.html new file mode 100644 index 0000000..ac2f7a6 --- /dev/null +++ b/htdocs/index.html @@ -0,0 +1,3 @@ +{{ define "body_content" }} +

Hello, world!

+{{ end }} diff --git a/htdocs/software/index.html b/htdocs/software/index.html new file mode 100644 index 0000000..4b1092d --- /dev/null +++ b/htdocs/software/index.html @@ -0,0 +1,7 @@ +{{ define "title" }} + software | samanthony.xyz +{{ end }} + +{{ define "body_content" }} +

This is the software page

+{{ end }} diff --git a/htdocs/style.css b/htdocs/style.css new file mode 100644 index 0000000..ae0ac35 --- /dev/null +++ b/htdocs/style.css @@ -0,0 +1,29 @@ +body { + margin-left: 0px; + margin-right: 0px; + margin-top: 0px; + + background-color: black; + color: white; + + font-family: sans-serif; +} + +/* Navbar */ +nav { + background-color: #4acaa4; + font-size: 1.6em; +} +nav a { + font-size: 0.7em; + color: white; + text-decoration: none; +} +nav p:first-child + a { font-weight: bold; } +nav a.this-section { font-style: italic; } +nav p { display: inline; } +nav p:first-child { margin-left: 0.1em; } +nav hr { + margin: 0px; + color: white; +} diff --git a/index.html b/index.html deleted file mode 100644 index 39a00d6..0000000 --- a/index.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -

Hello, world!

- - diff --git a/server.go b/server.go new file mode 100644 index 0000000..d40c86c --- /dev/null +++ b/server.go @@ -0,0 +1,106 @@ +package main + +import ( + "fmt" + tmpl "html/template" + "io/fs" + "log" + "net/http" + "os" + "path" + fp "path/filepath" + "strings" +) + +const ( + host = "" + port = "6969" + root = "htdocs/" +) + +var tmpls = make(map[string]*tmpl.Template) + +func init() { + err := fp.WalkDir(root, func(path string, d fs.DirEntry, err error) error { + if fp.Clean(path) == fp.Clean(root) || + fp.Ext(path) != ".html" || + path == fp.Join(root, "base.html") { + return nil + } + label := path[len(fp.Clean(root)):] + tmpls[label] = tmpl.Must(tmpl.ParseFiles(fp.Join(root, "base.html"), path)) + return nil + }) + if err != nil { + log.Fatal(err) + } +} + +type Page struct { + Nav Nav +} + +type Nav struct { + ThisSection string + Links []NavLink +} + +type NavLink struct { + Href string + Label string +} + +var nav = Nav{ + Links: []NavLink{ + {"/", "samanthony.xyz"}, + {"/software/", "software"}, + }, +} + +func rootHandler(w http.ResponseWriter, r *http.Request) { + reqPath := r.URL.Path + + // If request directory, serve index.html. + // ie. /software -> /software/index.html + if info, err := os.Stat(fp.Join(root, reqPath)); err == nil { + if info.IsDir() { + reqPath = path.Join(reqPath, "index.html") + } + } else if os.IsNotExist(err) { + http.NotFound(w, r) + return + } else { + fmt.Println(err) + code := http.StatusInternalServerError + http.Error(w, http.StatusText(code), code) + return + } + + if t, ok := tmpls[reqPath]; ok { + thisSection := "" + for _, link := range nav.Links { + if strings.HasPrefix(reqPath, link.Href) { + thisSection = link.Href + } + } + nav := nav + nav.ThisSection = thisSection + page := Page{nav} + + err := t.Execute(w, page) + if err != nil { + fmt.Println(err) + code := http.StatusInternalServerError + http.Error(w, http.StatusText(code), code) + return + } + } else { + http.ServeFile(w, r, fp.Join(root, reqPath)) + } +} + +func main() { + http.HandleFunc("/", rootHandler) + fmt.Printf("Listening on %s:%s\n", host, port) + log.Fatal(http.ListenAndServe(fmt.Sprintf("%s:%s", host, port), nil)) +} -- cgit v1.2.3 From 1ebdb78c0c710427481da79260e7b7573b331334 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Sun, 17 Apr 2022 21:33:34 -0230 Subject: add dev mode and tls support to server --- .gitignore | 2 ++ Makefile | 11 ++++++---- go.sum | 0 server.go | 70 +++++++++++++++++++++++++++++++++++++++++++++++++------------- 4 files changed, 65 insertions(+), 18 deletions(-) create mode 100644 .gitignore create mode 100644 go.sum diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..241531c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/devserver +/webserver diff --git a/Makefile b/Makefile index 5add856..5db9fc4 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,11 @@ -build: tidy format - go build +build_dev: tidy format + go build -o devserver + +serve_dev: build_dev + ./devserver --dev -serve: tidy format - go run . +build: tidy format + GOOS=openbsd GOARCH=amd64 go build -o webserver live: rsync -rtvzP ./htdocs/ sam@samanthony.xyz:/var/www/htdocs/samanthony.xyz/ diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..e69de29 diff --git a/server.go b/server.go index d40c86c..225d77f 100644 --- a/server.go +++ b/server.go @@ -1,6 +1,7 @@ package main import ( + "flag" "fmt" tmpl "html/template" "io/fs" @@ -12,23 +13,50 @@ import ( "strings" ) +var ( + host = "samanthony.xyz" + port = "443" + htdocs = "/var/www/htdocs/samanthony.xyz" +) + +const ( + acmeDocs = "/var/www/acme/" + certFile = "/etc/ssl/samanthony.xyz.fullchain.pem" + keyFile = "/etc/ssl/private/samanthony.xyz.key" +) + const ( - host = "" - port = "6969" - root = "htdocs/" + devHost = "localhost" + devPort = "6969" + devHtdocs = "htdocs/" ) +var devMode bool + +func init() { + flag.BoolVar(&devMode, "dev", false, + "Run server in debug/development mode (on localhost without tls)") + + flag.Parse() + + if devMode { + host = devHost + port = devPort + htdocs = devHtdocs + } +} + var tmpls = make(map[string]*tmpl.Template) func init() { - err := fp.WalkDir(root, func(path string, d fs.DirEntry, err error) error { - if fp.Clean(path) == fp.Clean(root) || + err := fp.WalkDir(htdocs, func(path string, d fs.DirEntry, err error) error { + if fp.Clean(path) == fp.Clean(htdocs) || fp.Ext(path) != ".html" || - path == fp.Join(root, "base.html") { + path == fp.Join(htdocs, "base.html") { return nil } - label := path[len(fp.Clean(root)):] - tmpls[label] = tmpl.Must(tmpl.ParseFiles(fp.Join(root, "base.html"), path)) + label := path[len(fp.Clean(htdocs)):] + tmpls[label] = tmpl.Must(tmpl.ParseFiles(fp.Join(htdocs, "base.html"), path)) return nil }) if err != nil { @@ -62,7 +90,7 @@ func rootHandler(w http.ResponseWriter, r *http.Request) { // If request directory, serve index.html. // ie. /software -> /software/index.html - if info, err := os.Stat(fp.Join(root, reqPath)); err == nil { + if info, err := os.Stat(fp.Join(htdocs, reqPath)); err == nil { if info.IsDir() { reqPath = path.Join(reqPath, "index.html") } @@ -70,7 +98,7 @@ func rootHandler(w http.ResponseWriter, r *http.Request) { http.NotFound(w, r) return } else { - fmt.Println(err) + log.Println(err) code := http.StatusInternalServerError http.Error(w, http.StatusText(code), code) return @@ -89,18 +117,32 @@ func rootHandler(w http.ResponseWriter, r *http.Request) { err := t.Execute(w, page) if err != nil { - fmt.Println(err) + log.Println(err) code := http.StatusInternalServerError http.Error(w, http.StatusText(code), code) return } } else { - http.ServeFile(w, r, fp.Join(root, reqPath)) + http.ServeFile(w, r, fp.Join(htdocs, reqPath)) } } func main() { http.HandleFunc("/", rootHandler) - fmt.Printf("Listening on %s:%s\n", host, port) - log.Fatal(http.ListenAndServe(fmt.Sprintf("%s:%s", host, port), nil)) + if !devMode { + http.Handle("/.well-known/acme-challenge/", + http.StripPrefix( + "/.well-known/acme-challenge/", + http.FileServer(http.Dir(acmeDocs)), + ), + ) + } + + if devMode { + log.Printf("Listening on %s:%s\n", devHost, devPort) + log.Fatal(http.ListenAndServe(fmt.Sprintf("%s:%s", devHost, devPort), nil)) + } else { + log.Printf("Listening on %s:%s\n", host, port) + log.Fatal(http.ListenAndServeTLS(fmt.Sprintf("%s:%s", host, port), certFile, keyFile, nil)) + } } -- cgit v1.2.3 From f75795e0f868f7a0cf2fd914086275d09b9ac930 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Tue, 19 Apr 2022 18:01:30 -0230 Subject: run in chroot and serve content as non-root --- Makefile | 2 +- go.mod | 2 + go.sum | 2 + server.go | 135 ++++++++++++++++++++++++++++++++++++++++---------------------- util.go | 85 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 178 insertions(+), 48 deletions(-) create mode 100644 util.go diff --git a/Makefile b/Makefile index 5db9fc4..a393724 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ build_dev: tidy format go build -o devserver serve_dev: build_dev - ./devserver --dev + ./devserver --chroot ./ --root /htdocs/ --host localhost build: tidy format GOOS=openbsd GOARCH=amd64 go build -o webserver diff --git a/go.mod b/go.mod index ace7593..a128ff8 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,5 @@ module git.samanthony.xyz/samanthony.xyz go 1.18 + +require golang.org/x/sys v0.0.0-20220412211240-33da011f77ad diff --git a/go.sum b/go.sum index e69de29..7f2d82d 100644 --- a/go.sum +++ b/go.sum @@ -0,0 +1,2 @@ +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/server.go b/server.go index 225d77f..c0f9bb6 100644 --- a/server.go +++ b/server.go @@ -3,9 +3,11 @@ package main import ( "flag" "fmt" - tmpl "html/template" + "golang.org/x/sys/unix" + "html/template" "io/fs" "log" + "net" "net/http" "os" "path" @@ -13,50 +15,88 @@ import ( "strings" ) +// Flags var ( - host = "samanthony.xyz" - port = "443" - htdocs = "/var/www/htdocs/samanthony.xyz" + host = "localhost" + port = "80" + chroot = "/var/www/" + user = "www" + group = "www" + root = "/htdocs/samanthony.xyz/" ) -const ( - acmeDocs = "/var/www/acme/" - certFile = "/etc/ssl/samanthony.xyz.fullchain.pem" - keyFile = "/etc/ssl/private/samanthony.xyz.key" -) +func init() { + flag.StringVar(&host, "host", host, "") + flag.StringVar(&port, "port", port, "") + flag.StringVar(&chroot, "chroot", chroot, "") + flag.StringVar(&user, "user", user, "") + flag.StringVar(&group, "group", group, "") + flag.StringVar(&root, "root", root, "") -const ( - devHost = "localhost" - devPort = "6969" - devHtdocs = "htdocs/" -) + flag.Parse() +} -var devMode bool +// Must lookup the hostname before entering the chroot. +var addr = "" func init() { - flag.BoolVar(&devMode, "dev", false, - "Run server in debug/development mode (on localhost without tls)") + // host is an ip address + if ip := net.ParseIP(host); ip != nil { + addr = ip.String() + } else { // host is a domain name + addrs, err := net.LookupHost(host) + if err != nil { + log.Fatal(err) + } + for _, a := range addrs { + if ip := net.ParseIP(a); ip != nil { + if v4 := ip.To4(); v4 != nil { + addr = v4.String() + } + } + } + if addr == "" { + log.Fatalf("No ipv4 address bound to %s", host) + } + } +} - flag.Parse() +var ( + uid int + gid int +) - if devMode { - host = devHost - port = devPort - htdocs = devHtdocs +func init() { + var err error + uid, err = uidOf(user) + if err != nil { + log.Fatal(err) + } + gid, err = gidOf(group) + if err != nil { + log.Fatal(err) } } -var tmpls = make(map[string]*tmpl.Template) +// Enter chroot +func init() { + if err := unix.Chroot(chroot); err != nil { + log.Fatalf("chroot: %s: %v", chroot, err) + } +} + +// Build templates +var tmpl = make(map[string]*template.Template) func init() { - err := fp.WalkDir(htdocs, func(path string, d fs.DirEntry, err error) error { - if fp.Clean(path) == fp.Clean(htdocs) || + err := fp.WalkDir(root, func(path string, d fs.DirEntry, err error) error { + if fp.Clean(path) == fp.Clean(root) || fp.Ext(path) != ".html" || - path == fp.Join(htdocs, "base.html") { + path == fp.Join(root, "base.html") { return nil } - label := path[len(fp.Clean(htdocs)):] - tmpls[label] = tmpl.Must(tmpl.ParseFiles(fp.Join(htdocs, "base.html"), path)) + label := path[len(fp.Clean(root)):] + tmpl[label] = template.Must(template.ParseFiles(fp.Join(root, "base.html"), path)) return nil }) if err != nil { @@ -64,6 +104,7 @@ func init() { } } +// Template data type Page struct { Nav Nav } @@ -86,11 +127,18 @@ var nav = Nav{ } func rootHandler(w http.ResponseWriter, r *http.Request) { + if err := dropPerms(uid, gid); err != nil { + log.Println(err) + code := http.StatusInternalServerError + http.Error(w, http.StatusText(code), code) + return + } + reqPath := r.URL.Path // If request directory, serve index.html. // ie. /software -> /software/index.html - if info, err := os.Stat(fp.Join(htdocs, reqPath)); err == nil { + if info, err := os.Stat(fp.Join(root, reqPath)); err == nil { if info.IsDir() { reqPath = path.Join(reqPath, "index.html") } @@ -104,7 +152,7 @@ func rootHandler(w http.ResponseWriter, r *http.Request) { return } - if t, ok := tmpls[reqPath]; ok { + if t, ok := tmpl[reqPath]; ok { thisSection := "" for _, link := range nav.Links { if strings.HasPrefix(reqPath, link.Href) { @@ -123,26 +171,19 @@ func rootHandler(w http.ResponseWriter, r *http.Request) { return } } else { - http.ServeFile(w, r, fp.Join(htdocs, reqPath)) + http.ServeFile(w, r, fp.Join(root, reqPath)) } } func main() { http.HandleFunc("/", rootHandler) - if !devMode { - http.Handle("/.well-known/acme-challenge/", - http.StripPrefix( - "/.well-known/acme-challenge/", - http.FileServer(http.Dir(acmeDocs)), - ), - ) - } - - if devMode { - log.Printf("Listening on %s:%s\n", devHost, devPort) - log.Fatal(http.ListenAndServe(fmt.Sprintf("%s:%s", devHost, devPort), nil)) - } else { - log.Printf("Listening on %s:%s\n", host, port) - log.Fatal(http.ListenAndServeTLS(fmt.Sprintf("%s:%s", host, port), certFile, keyFile, nil)) - } + http.Handle("/.well-known/acme-challenge/", + http.StripPrefix( + "/.well-known/acme-challenge/", + http.FileServer(http.Dir("/acme/")), + ), + ) + + log.Printf("Listening on %s:%s\n", addr, port) + log.Fatal(http.ListenAndServe(fmt.Sprintf("%s:%s", addr, port), nil)) } diff --git a/util.go b/util.go new file mode 100644 index 0000000..426459b --- /dev/null +++ b/util.go @@ -0,0 +1,85 @@ +package main + +import ( + "bufio" + "errors" + "fmt" + "golang.org/x/sys/unix" + "log" + "os" + "runtime" + "strconv" + "strings" +) + +func uidOf(user string) (int, error) { + passwdFile, err := os.Open("/etc/passwd") + if err != nil { + return -1, err + } + defer passwdFile.Close() + + scanner := bufio.NewScanner(passwdFile) + scanner.Split(bufio.ScanLines) + for scanner.Scan() { + line := scanner.Text() + + parsed := strings.Split(line, ":") + + name := parsed[0] + + if name == user { + uid, err := strconv.Atoi(parsed[2]) + if err != nil { + return -1, err + } + return uid, nil + } + } + return -1, errors.New(fmt.Sprintf("user '%s' not in /etc/passwd", user)) +} + +func gidOf(group string) (int, error) { + groupFile, err := os.Open("/etc/group") + if err != nil { + return -1, err + } + defer groupFile.Close() + + scanner := bufio.NewScanner(groupFile) + scanner.Split(bufio.ScanLines) + for scanner.Scan() { + line := scanner.Text() + + parsed := strings.Split(line, ":") + + name := parsed[0] + + if name == group { + gid, err := strconv.Atoi(parsed[2]) + if err != nil { + return -1, err + } + return gid, nil + } + } + return -1, errors.New(fmt.Sprintf("group '%s' not in /etc/group", group)) +} + +func dropPerms(uid, gid int) error { + if runtime.GOOS != "linux" { + if err := unix.Setgid(gid); err != nil { + return errors.New(fmt.Sprintf("setgid(%d): %v", gid, err)) + } + if err := unix.Setuid(uid); err != nil { + return errors.New(fmt.Sprintf("setuid(%d): %v", uid, err)) + } + return nil + } else { + // setuid/setgid has supposedly been fully supported on Linux + // since go 1.16 but I can't seem to get it to work properly. + log.Print("setgid not supported on Linux, skipping.") + log.Print("setuid not supported on Linux, skipping.") + return nil + } +} -- cgit v1.2.3 From 0c4551dee05609e484221fe40827cf36a9966a93 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Tue, 19 Apr 2022 22:30:42 -0230 Subject: make navbar display inline in text-based browsers --- htdocs/base.html | 8 ++++++-- htdocs/style.css | 31 +++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/htdocs/base.html b/htdocs/base.html index 5c02174..cc85064 100644 --- a/htdocs/base.html +++ b/htdocs/base.html @@ -17,9 +17,13 @@ {{ $this_section := .Nav.ThisSection }} {{ range .Nav.Links }} {{ if eq .Href $this_section }} -

/

{{ .Label }} + + /{{ .Label }} + {{else }} -

|

{{ .Label }} + + |{{ .Label }} + {{ end }} {{ end }}
diff --git a/htdocs/style.css b/htdocs/style.css index ae0ac35..d260d69 100644 --- a/htdocs/style.css +++ b/htdocs/style.css @@ -1,3 +1,4 @@ +/* General */ body { margin-left: 0px; margin-right: 0px; @@ -9,21 +10,31 @@ body { font-family: sans-serif; } -/* Navbar */ -nav { - background-color: #4acaa4; - font-size: 1.6em; +a { text-decoration: none; } +a:hover { + text-decoration: underline; + text-decoration-thickness: 0.055em; } + +/* Navbar */ +nav { background-color: #4acaa4; } + nav a { - font-size: 0.7em; + margin-left: 0.2em; + + font-size: 1.6em; + font-weight: normal; color: white; - text-decoration: none; } -nav p:first-child + a { font-weight: bold; } -nav a.this-section { font-style: italic; } -nav p { display: inline; } -nav p:first-child { margin-left: 0.1em; } + +nav a:first-child .label { font-weight: bold; } + +nav .label { font-size: 0.7em; } + +nav .this-section { font-style: italic; } + nav hr { margin: 0px; + color: white; } -- cgit v1.2.3 From 5ad2cb5fd0ff73db8263dda792e69508873f1de2 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Sat, 23 Apr 2022 18:17:12 -0230 Subject: add index page --- htdocs/base.html | 8 +++- htdocs/css/style.css | 69 ++++++++++++++++++++++++++++++++++ htdocs/css/syntax.css | 19 ++++++++++ htdocs/index.html | 101 +++++++++++++++++++++++++++++++++++++++++++++++++- htdocs/style.css | 40 -------------------- 5 files changed, 194 insertions(+), 43 deletions(-) create mode 100644 htdocs/css/style.css create mode 100644 htdocs/css/syntax.css delete mode 100644 htdocs/style.css diff --git a/htdocs/base.html b/htdocs/base.html index cc85064..7a3c97f 100644 --- a/htdocs/base.html +++ b/htdocs/base.html @@ -7,10 +7,12 @@ {{ define "title" }}samanthony.xyz{{ end }} {{ template "title" }} + {{ define "style" }}{{ end }} {{ template "style" }} - + + - {{ template "body_content" }} +
+ {{ template "body_content" }} +
diff --git a/htdocs/css/style.css b/htdocs/css/style.css new file mode 100644 index 0000000..1c6db7c --- /dev/null +++ b/htdocs/css/style.css @@ -0,0 +1,69 @@ +:root { + --fg-color: white; + --bg-color: black; + --highlight-color: #4acaa4; +} + +/* General */ +body { + background-color: var(--bg-color); + color: var(--fg-color); + + font-family: sans-serif; +} + +.hanging-indent { + padding-left: 2em; + text-index: -2em; +} + +/* Links */ +a { + color: var(--highlight-color); + text-decoration: none; +} +a:hover { text-decoration: underline 0.055em; } + +/* Headers */ +header :first-child { margin-bottom: 0px; } +header hr { + margin: 0px; + color: var(--fg-color); +} + +/* Quotes */ +blockquote p { margin: 0px; } +blockquote p:first-child { font-style: italic; } +blockquote p:nth-child(2) { + text-indent: 2em; +} + +/* Lists */ +ul { padding-left: 2em; } + +/* Nav */ +body { margin: 0px; } +nav { background-color: var(--highlight-color); } +nav a { + margin-left: 0.2em; + + font-size: 1.6em; + font-weight: normal; + + color: var(--fg-color); +} +nav a:first-child .label { font-weight: bold; } +nav .label { font-size: 0.7em; } +nav .this-section { font-style: italic; } +nav hr { + margin: 0px; + color: var(--fg-color); +} + +/* Main page content */ +main { + margin: auto; + max-width: 80em; + padding-left: 1em; + padding-right: 1em; +} diff --git a/htdocs/css/syntax.css b/htdocs/css/syntax.css new file mode 100644 index 0000000..f425178 --- /dev/null +++ b/htdocs/css/syntax.css @@ -0,0 +1,19 @@ +code { + border: 0.055em solid var(--highlight-color); + border-radius: 0.5em; + padding-top: 0.2em; + padding-bottom: 0.1em; + padding-left: 0.5em; + padding-right: 0.5em; + + display: inline-block; + vertical-align: middle; + + background-color: #282828; +} + +/* HTML */ +/* Tag */ code[data-lang="html"] .t { color: var(--highlight-color); } +/* Element */ code[data-lang="html"] .e { color: #9b5712; } +/* AttributeName */ code[data-lang="html"] .an { color: #91931b; } +/* AttributeValue */ code[data-lang="html"] .av { color: red; } diff --git a/htdocs/index.html b/htdocs/index.html index ac2f7a6..e02436e 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -1,3 +1,102 @@ {{ define "body_content" }} -

Hello, world!

+
+

Why This Site Exists

+
+
+ +

+ Most of the modern Web sucks. This is my futile attempt at changing that. +

+ +

+ Many sites these days try to solve problems that don't exist using improper + tools and techniques to do so. The classic example is JavaScript; + client-side scripting can be quite useful in certain situations. + The problem, however, is that most situations are not these situations. +

+ +

+ The vast majority of websites could be simple HTML( + CSS) pages and gain all + the benefits that go along with that, namely simplicity, + speed/performance and + + reliability. + Instead, people choose to complicate things. +

+ +

"Install this plugin!"

+

"Use this framework!"

+ +

+ Rather than fixing the underlying problem by stripping back the layers to + find that we really just want to render some HTML, we instead pile more + on top, obscuring and worsening whatever problem we think we're trying to + solve. +

+ +
+

+ "Millions of jobs are based on outputting HTML in an inefficient way." +

+

— suckless.org

+
+ +

+ Some common excuses for "I need to use x:" +

    +
  • + "It's responsive" +
    +

    + Setting this meta tag: + + <meta + name="viewport" + content="width=device-width, initial-scale=1.0"> + + + along with some very basic CSS is all that's required for a + responsive site that looks good on any screen. +

    +
    • +
  • + "It looks nicer" +

    + JavaScript. Cascading + Style Sheets. See the problem? + Don't use scripts for styling. Also, no, it doesn't look nicer. +

    +
    • +
  • + "It's makes for a better user experience" +

    + If you like waiting seconds for a page to load before scrolling an + entire screen height with a parallaxed background just to read two + words then yes, that is a good experience. + Personally, I would rather not have to hover my cursor through a maze + of eight nested, animated drop-down menus while being bombarded by + popups asking for personal information and telling me that the site + uses + + cookies. +

    +
    • +
+

+ +
+

What Can We Do?

+
+
+ +

+ Start your own website where you can complain about stuff too! Anyone can + and everyone should. With + all the information that's out there + it's never been easier to help fix the Web by creating your own site. + +

+ You can read the boring technical details of how this site is implemented + here. +

{{ end }} diff --git a/htdocs/style.css b/htdocs/style.css deleted file mode 100644 index d260d69..0000000 --- a/htdocs/style.css +++ /dev/null @@ -1,40 +0,0 @@ -/* General */ -body { - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; - - background-color: black; - color: white; - - font-family: sans-serif; -} - -a { text-decoration: none; } -a:hover { - text-decoration: underline; - text-decoration-thickness: 0.055em; -} - -/* Navbar */ -nav { background-color: #4acaa4; } - -nav a { - margin-left: 0.2em; - - font-size: 1.6em; - font-weight: normal; - color: white; -} - -nav a:first-child .label { font-weight: bold; } - -nav .label { font-size: 0.7em; } - -nav .this-section { font-style: italic; } - -nav hr { - margin: 0px; - - color: white; -} -- cgit v1.2.3 From b1a3d5e5ae2b2e8e28db187b98cab82f5717a931 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Tue, 26 Apr 2022 17:34:13 -0230 Subject: add samanthony.xyz software page --- htdocs/css/style.css | 44 ++++++++++++++++---------------- htdocs/index.html | 5 ---- htdocs/software/index.html | 15 ++++++++++- htdocs/software/samanthony.xyz.html | 50 +++++++++++++++++++++++++++++++++++++ server.go | 3 ++- 5 files changed, 87 insertions(+), 30 deletions(-) create mode 100644 htdocs/software/samanthony.xyz.html diff --git a/htdocs/css/style.css b/htdocs/css/style.css index 1c6db7c..7403843 100644 --- a/htdocs/css/style.css +++ b/htdocs/css/style.css @@ -4,7 +4,6 @@ --highlight-color: #4acaa4; } -/* General */ body { background-color: var(--bg-color); color: var(--fg-color); @@ -12,11 +11,32 @@ body { font-family: sans-serif; } +main { + margin: auto; + max-width: 80em; + padding-left: 1em; + padding-right: 1em; +} + .hanging-indent { padding-left: 2em; text-index: -2em; } +header :first-child { margin-bottom: 0px; } + +hr { + margin: 0px; + color: var(--fg-color); +} + +ul { padding-left: 2em; } + +/* Tables */ +table { padding-top: 1em; } +th { text-align: left; } +td:first-child { padding-right: 0.5em; } + /* Links */ a { color: var(--highlight-color); @@ -24,13 +44,6 @@ a { } a:hover { text-decoration: underline 0.055em; } -/* Headers */ -header :first-child { margin-bottom: 0px; } -header hr { - margin: 0px; - color: var(--fg-color); -} - /* Quotes */ blockquote p { margin: 0px; } blockquote p:first-child { font-style: italic; } @@ -38,9 +51,6 @@ blockquote p:nth-child(2) { text-indent: 2em; } -/* Lists */ -ul { padding-left: 2em; } - /* Nav */ body { margin: 0px; } nav { background-color: var(--highlight-color); } @@ -55,15 +65,3 @@ nav a { nav a:first-child .label { font-weight: bold; } nav .label { font-size: 0.7em; } nav .this-section { font-style: italic; } -nav hr { - margin: 0px; - color: var(--fg-color); -} - -/* Main page content */ -main { - margin: auto; - max-width: 80em; - padding-left: 1em; - padding-right: 1em; -} diff --git a/htdocs/index.html b/htdocs/index.html index e02436e..821d693 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -94,9 +94,4 @@ and everyone should. With all the information that's out there it's never been easier to help fix the Web by creating your own site. - -

- You can read the boring technical details of how this site is implemented - here. -

{{ end }} diff --git a/htdocs/software/index.html b/htdocs/software/index.html index 4b1092d..ecf8d95 100644 --- a/htdocs/software/index.html +++ b/htdocs/software/index.html @@ -3,5 +3,18 @@ {{ end }} {{ define "body_content" }} -

This is the software page

+
+

Software Hosted Here

+
+
+ + + + + + + +
namedescription
samanthony.xyz + This website +
{{ end }} diff --git a/htdocs/software/samanthony.xyz.html b/htdocs/software/samanthony.xyz.html new file mode 100644 index 0000000..dc0c38c --- /dev/null +++ b/htdocs/software/samanthony.xyz.html @@ -0,0 +1,50 @@ +{{ define "title" }} + software | samanthony.xyz +{{ end }} + +{{ define "style" }} + +{{ end }} + +{{ define "body_content" }} +
+

samanthony.xyz

+

This website

+
+
+

+ Get a copy of the source code with + git clone git://samanthony.xyz/samanthony.xyz.git. +

+

+ The site uses HTML templates to avoid tedium and for the ability to make + small changes across the entire site without editing multiple files. It uses + the html/template package included in Go's standard library. +

+

+ A server is required to serve these templates. Once again Go provides with + the built in http package. This makes writing a web server extremely easy. + All you have to do is write a function to handle incoming requests and call + http.ListenAndServe(). Painless. +

+

+ Since I'm running OpenBSD, TLS can be dealt with external to the webserver + by using relayd. As an aside, I encourage anyone looking for an operating + system to give OpenBSD a look. It's been an absolute pleasure to work with + so far. As long as you don't expect it to be exactly like a Linux-based + system (it's not), then not only is it more secure, but also + easier to use than something Linux-based. Even for a noob like + myself. Sane design and good documentation go a long way. +

+

+ Inspiration was taken from httpd and the server runs chroot'd. When + serving content it also drops down to an unprivileged user with setuid. +

+{{ end }} diff --git a/server.go b/server.go index c0f9bb6..eff4ce9 100644 --- a/server.go +++ b/server.go @@ -96,7 +96,8 @@ func init() { return nil } label := path[len(fp.Clean(root)):] - tmpl[label] = template.Must(template.ParseFiles(fp.Join(root, "base.html"), path)) + tmpl[label] = template.Must(template.ParseFiles( + fp.Join(root, "base.html"), path)) return nil }) if err != nil { -- cgit v1.2.3 From d1e4cb14f745298316095c6fb064f00f67bcdf88 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Tue, 24 May 2022 16:17:43 -0230 Subject: add license --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ server.go | 18 ++ util.go | 18 ++ 3 files changed, 710 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/server.go b/server.go index eff4ce9..6296574 100644 --- a/server.go +++ b/server.go @@ -1,3 +1,21 @@ +/* +Copyright 2022 Sam Anthony + +This file is part of samanthony.xyz. + +samanthony.xyz is free software: you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation, either version 3 of the License, or (at your option) any later +version. + +samanthony.xyz is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +samanthony.xyz. If not, see . +*/ + package main import ( diff --git a/util.go b/util.go index 426459b..5910a9f 100644 --- a/util.go +++ b/util.go @@ -1,3 +1,21 @@ +/* +Copyright 2022 Sam Anthony + +This file is part of samanthony.xyz. + +samanthony.xyz is free software: you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation, either version 3 of the License, or (at your option) any later +version. + +samanthony.xyz is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +samanthony.xyz. If not, see . +*/ + package main import ( -- cgit v1.2.3 From 05c0326c12d64995b6d7047dd2cae07e997539bd Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Tue, 24 May 2022 17:47:07 -0230 Subject: add footer --- htdocs/base.html | 9 +++++++++ htdocs/css/style.css | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/htdocs/base.html b/htdocs/base.html index 7a3c97f..f96c9c7 100644 --- a/htdocs/base.html +++ b/htdocs/base.html @@ -33,5 +33,14 @@
{{ template "body_content" }}
+