SeanOMik
/
roulette
mirror of https://git.seedno.de/seednode/roulette.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added file not found response for invalid files

This commit is contained in:
Seednode 2022-09-08 15:57:52 -05:00
parent 6f1c0c3943
commit 7d40d25b40
2 changed files with 94 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/version.go
View File

@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
var Version = "0.0.1" var Version = "0.1.0"
func init() { func init() {
rootCmd.AddCommand(versionCmd) rootCmd.AddCommand(versionCmd)

136
cmd/web.go
View File

@ -5,6 +5,7 @@ Copyright © 2022 Seednode <seednode@seedno.de>
package cmd package cmd
import ( import (
"errors"
"fmt" "fmt"
"io" "io"
"log" "log"
@ -12,75 +13,124 @@ import (
"net/url" "net/url"
"os" "os"
"strconv" "strconv"
"strings"
) )
func generateHeader(fileName string) string { func generatePageHtml(w http.ResponseWriter, paths []string) error {
htmlHeader := `<html lang="en">
<head>
<style>img{max-width:100%;max-height:97vh;height:auto;}</style>
<title>`
htmlHeader += fileName
htmlHeader += `</title>
</head>
<body>
`
return htmlHeader
}
func generateFooter() string {
htmlFooter := ` </body>
</html>`
return htmlFooter
}
func generatePageHtml(w http.ResponseWriter, paths []string, output []string) {
fileList, err := getFileList(paths) fileList, err := getFileList(paths)
if err != nil { if err != nil {
panic(err) return err
} }
fileName, filePath := pickFile(fileList) fileName, filePath := pickFile(fileList)
w.Header().Add("Content-Type", "text/html") w.Header().Add("Content-Type", "text/html")
_, err = io.WriteString(w, generateHeader(fileName)) htmlBody := `<html lang="en">
if err != nil { <head>
fmt.Println(err) <style>img{max-width:100%;max-height:97vh;height:auto;}</style>
} <title>`
htmlBody += fileName
htmlBody := ` <a href="/"><img src="` htmlBody += `</title>
</head>
<body>
<a href="/"><img src="`
htmlBody += filePath htmlBody += filePath
htmlBody += `"></img></a> htmlBody += `"></img></a>
` `
_, err = io.WriteString(w, htmlBody) _, err = io.WriteString(w, htmlBody)
_, err = io.WriteString(w, generateFooter())
if err != nil { if err != nil {
fmt.Println(err) return err
} }
return nil
}
func statusNotFound(w http.ResponseWriter, filePath string) error {
fmt.Println("Client requested non-existent file " + filePath + ".")
w.WriteHeader(http.StatusNotFound)
w.Header().Set("Content-Type", "txt/plain")
htmlBody := "File not found."
_, err := io.WriteString(w, htmlBody)
if err != nil {
return err
}
return nil
}
func statusForbidden(w http.ResponseWriter, filePath string) error {
fmt.Println("Client requested forbidden file " + filePath + ".")
w.WriteHeader(http.StatusForbidden)
w.Header().Set("Content-Type", "txt/plain")
htmlBody := "Access denied."
_, err := io.WriteString(w, htmlBody)
if err != nil {
return err
}
return nil
}
func serveStaticFile(w http.ResponseWriter, request string, paths []string) error {
filePath, err := url.QueryUnescape(request)
if err != nil {
return err
}
var matchesPrefix = false
for i := 0; i < len(paths); i++ {
if strings.HasPrefix(filePath, paths[i]) {
matchesPrefix = true
}
}
if matchesPrefix == false {
err := statusNotFound(w, filePath)
if err != nil {
return err
}
return nil
}
_, err = os.Stat(filePath)
if errors.Is(err, os.ErrNotExist) {
err := statusNotFound(w, filePath)
if err != nil {
return err
}
return nil
} else if !errors.Is(err, os.ErrNotExist) && err != nil {
return err
}
buf, err := os.ReadFile(filePath)
if err != nil {
return err
}
w.Write(buf)
return nil
} }
func servePageHandler(paths []string) http.HandlerFunc { func servePageHandler(paths []string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
var output []string
request := r.RequestURI
if r.RequestURI == "/" { if r.RequestURI == "/" {
generatePageHtml(w, paths, output) err := generatePageHtml(w, paths)
} else {
f, err := url.QueryUnescape(request)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
return
} }
buf, err := os.ReadFile(f) } else {
err := serveStaticFile(w, r.RequestURI, paths)
if err != nil { if err != nil {
panic(err) log.Fatal(err)
} }
w.Write(buf)
} }
} }
} }