TheLovinator/feedvault.se
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve validateURL()

Browse source
This commit is contained in:
Joakim Hellsén 2024-02-04 03:22:54 +01:00
commit 263e89e292
2 changed files with 114 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

104
main.go
View file

@ -1,10 +1,14 @@
package main
import (
"errors"
"fmt"
"html/template"
"log"
"net"
"net/http"
"net/url"
"strings"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
@ -41,6 +45,7 @@ func main() {
r.Get("/about", AboutHandler)
r.Get("/donate", DonateHandler)
r.Get("/feeds", FeedsHandler)
r.Post("/add", AddFeedHandler)
r.Handle("/static/*", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
@ -60,6 +65,13 @@ type Data struct {
FeedCount int
DatabaseSize string
Request *http.Request
ParseErrors []ParseResult
}
type ParseResult struct {
FeedURL string
Msg string
IsError bool
}
func (d *Data) GetDatabaseSizeAndFeedCount() {
@ -131,3 +143,95 @@ func DonateHandler(w http.ResponseWriter, _ *http.Request) {
func FeedsHandler(w http.ResponseWriter, _ *http.Request) {
renderPage(w, "Feeds", "Feeds Page", "feeds, page", "TheLovinator", "http://localhost:8000/feeds", "feeds")
}
func validateURL(feed_url string) error {
// Check if URL starts with http or https
if !strings.HasPrefix(feed_url, "http://") && !strings.HasPrefix(feed_url, "https://") {
return errors.New("URL must start with http:// or https://")
}
// Parse a url into a URL structure
u, err := url.Parse(feed_url)
if err != nil {
return errors.New("failed to parse URL")
}
// Get the domain from the URL
domain := u.Hostname()
domain = strings.TrimSpace(domain)
if domain == "" {
return errors.New("URL does not contain a domain")
}
// Don't allow IP address URLs
ip := net.ParseIP(domain)
if ip != nil {
return errors.New("IP address URLs are not allowed")
}
// Don't allow localhost URLs
if strings.Contains(domain, "localhost") {
return errors.New("localhost are not allowed")
}
// Don't allow URLs that end with .local
if strings.HasSuffix(domain, ".local") {
return errors.New("URLs ending with .local are not allowed")
}
// Check if the domain is resolvable
_, err = net.LookupIP(domain)
if err != nil {
return errors.New("failed to resolve domain")
}
// Check if the URL is reachable
_, err = http.Get(feed_url)
if err != nil {
return errors.New("failed to reach URL")
}
return nil
}
func AddFeedHandler(w http.ResponseWriter, r *http.Request) {
r.ParseForm()
urls := r.Form.Get("urls")
if urls == "" {
http.Error(w, "No feed URLs provided", http.StatusBadRequest)
return
}
var parseErrors []ParseResult
for _, feed_url := range strings.Split(urls, "\n") {
// TODO: Try to upgrade to https if http is provided
// Validate the URL
err := validateURL(feed_url)
if err != nil {
parseErrors = append(parseErrors, ParseResult{FeedURL: feed_url, Msg: err.Error(), IsError: true})
continue
}
// "Add" the feed to the database
log.Println("Adding feed:", feed_url)
}
// Render the index page with the parse errors
data := Data{
Title: "FeedVault",
Description: "FeedVault - A feed archive",
Keywords: "RSS, Atom, Feed, Archive",
ParseErrors: parseErrors,
}
data.GetDatabaseSizeAndFeedCount()
t, err := template.ParseFiles("templates/base.tmpl", "templates/index.tmpl")
if err != nil {
http.Error(w, fmt.Sprintf("Internal Server Error: %v", err), http.StatusInternalServerError)
return
}
t.ExecuteTemplate(w, "base", data)
}

10
templates/base.tmpl
View file

@ -13,6 +13,16 @@
<link rel="stylesheet" href="/static/style.css">
</head>
<body>
{{ if .ParseErrors }}
<h2>Results</h2>
<ul>
{{ range .ParseErrors }}
<li class="{{ if .IsError }}error{{ else }}success{{ end }}"><a href="{{ .FeedURL }}">{{ .FeedURL }}</a> - {{ .Msg }}</li>
{{ end }}
</ul>
{{ end }}
<span class="title">
<h1>
<a href="/">FeedVault</a>