go-shiori/shiori
1
1
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2025-09-28 07:44:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Dont allow invalid URL

Browse source
This commit is contained in:
Radhi Fadlillah 2018-03-08 20:57:25 +07:00
parent efd20cb400
commit fd1f190800
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cmd/add.go
View file

@ -1,6 +1,7 @@
package cmd
import (
"fmt"
nurl "net/url"
"strings"
"time"
@ -59,8 +60,14 @@ func addBookmark(base model.Bookmark, offline bool) (book model.Bookmark, err er
// Prepare initial result
book = base
// Make sure URL valid
parsedURL, err := nurl.ParseRequestURI(book.URL)
if err != nil {
return book, fmt.Errorf("URL is not valid")
}
// Clear UTM parameters from URL
book.URL, err = clearUTMParams(book.URL)
book.URL, err = clearUTMParams(parsedURL)
if err != nil {
return book, err
}
@ -101,14 +108,9 @@ func normalizeSpace(str string) string {
return strings.Join(strings.Fields(str), " ")
}
func clearUTMParams(uri string) (string, error) {
tempURL, err := nurl.Parse(uri)
if err != nil {
return "", err
}
func clearUTMParams(url *nurl.URL) (string, error) {
newQuery := nurl.Values{}
for key, value := range tempURL.Query() {
for key, value := range url.Query() {
if strings.HasPrefix(key, "utm_") {
continue
}
@ -116,6 +118,6 @@ func clearUTMParams(uri string) (string, error) {
newQuery[key] = value
}
tempURL.RawQuery = newQuery.Encode()
return tempURL.String(), nil
url.RawQuery = newQuery.Encode()
return url.String(), nil
}

9
cmd/update.go
View file

@ -2,6 +2,7 @@ package cmd
import (
"fmt"
nurl "net/url"
"strconv"
"strings"
"sync"
@ -100,8 +101,14 @@ func init() {
func updateBookmarks(indices []string, base model.Bookmark, offline, overwrite bool) ([]model.Bookmark, error) {
mutex := sync.Mutex{}
// Make sure URL valid
parsedURL, err := nurl.ParseRequestURI(base.URL)
if err != nil {
return []model.Bookmark{}, fmt.Errorf("URL is not valid")
}
// Clear UTM parameters from URL
url, err := clearUTMParams(base.URL)
url, err := clearUTMParams(parsedURL)
if err != nil {
return []model.Bookmark{}, err
}