From 424d1e9944518eb8665ba3930372646450436cf3 Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Mon, 8 Feb 2021 18:51:07 +0100 Subject: [PATCH] Fix lint errors --- activityPub.go | 16 +++++++------ activityPubSending.go | 12 ++++++---- authentication.go | 2 +- blogs.go | 4 ---- blogstats.go | 13 +++++------ cache.go | 1 - captcha.go | 5 +---- comments.go | 17 ++++++++------ editor.go | 2 +- go.sum | 47 --------------------------------------- hooks.go | 9 ++++---- indieAuth.go | 8 +++---- indieAuthServer.go | 36 +++++++++++++++++++++--------- micropub.go | 10 ++++----- micropubMedia.go | 2 +- postAliases.go | 4 +--- postsDb.go | 1 - render.go | 14 ++++++------ robotstxt.go | 3 +-- telegram.go | 12 +++++++--- templateAssets.go | 21 ++++++++--------- utils.go | 2 ++ webmention.go | 4 +--- webmentionSending.go | 4 +++- webmentionVerification.go | 10 +++++++-- 25 files changed, 118 insertions(+), 141 deletions(-) diff --git a/activityPub.go b/activityPub.go index 6a307d3..7f2e91f 100644 --- a/activityPub.go +++ b/activityPub.go @@ -118,7 +118,7 @@ func apHandleInbox(w http.ResponseWriter, r *http.Request) { if err == nil { u.Fragment = "" u.RawFragment = "" - apRemoveFollower(blogName, u.String()) + _ = apRemoveFollower(blogName, u.String()) w.WriteHeader(http.StatusOK) return } @@ -165,13 +165,13 @@ func apHandleInbox(w http.ResponseWriter, r *http.Request) { id, hasID := object["id"].(string) if hasReplyToString && hasID && len(inReplyTo) > 0 && len(id) > 0 && strings.Contains(inReplyTo, blogIri) { // It's an ActivityPub reply; save reply as webmention - createWebmention(id, inReplyTo) + _ = createWebmention(id, inReplyTo) } else if content, hasContent := object["content"].(string); hasContent && hasID && len(id) > 0 { // May be a mention; find links to blog and save them as webmentions if links, err := allLinksFromHTML(strings.NewReader(content), id); err == nil { for _, link := range links { if strings.Contains(link, blogIri) { - createWebmention(id, link) + _ = createWebmention(id, link) } } } @@ -233,7 +233,7 @@ func apVerifySignature(r *http.Request) (*asPerson, string, int, error) { func handleWellKnownHostMeta(w http.ResponseWriter, r *http.Request) { w.Header().Set(contentType, "application/xrd+xml"+charsetUtf8Suffix) - w.Write([]byte(``)) + _, _ = w.Write([]byte(``)) } func apGetRemoteActor(iri string) (*asPerson, int, error) { @@ -363,7 +363,9 @@ func apAccept(blogName string, blog *configBlog, follow map[string]interface{}) if endpoints := follower.Endpoints; endpoints != nil && endpoints.SharedInbox != "" { inbox = endpoints.SharedInbox } - apAddFollower(blogName, follower.ID, inbox) + if err = apAddFollower(blogName, follower.ID, inbox); err != nil { + return + } // remove @context from the inner activity delete(follow, "@context") accept := map[string]interface{}{ @@ -374,7 +376,7 @@ func apAccept(blogName string, blog *configBlog, follow map[string]interface{}) "type": "Accept", } _, accept["id"] = apNewID(blog) - apQueueSendSigned(blog.apIri(), follower.Inbox, accept) + _ = apQueueSendSigned(blog.apIri(), follower.Inbox, accept) } func apSendToAllFollowers(blog string, activity interface{}) { @@ -389,7 +391,7 @@ func apSendToAllFollowers(blog string, activity interface{}) { func apSendTo(blogIri string, activity interface{}, inboxes []string) { for _, i := range inboxes { go func(inbox string) { - apQueueSendSigned(blogIri, inbox, activity) + _ = apQueueSendSigned(blogIri, inbox, activity) }(i) } } diff --git a/activityPubSending.go b/activityPubSending.go index 8b34288..e20a67a 100644 --- a/activityPubSending.go +++ b/activityPubSending.go @@ -31,7 +31,11 @@ func apRequestBuilder() interface{} { func initAPSendQueue() (err error) { queuePath := "queues" if _, err := os.Stat(queuePath); os.IsNotExist(err) { - os.Mkdir(queuePath, 0755) + if err = os.Mkdir(queuePath, 0755); err != nil { + return err + } + } else if err != nil { + return err } apQueue, err = dque.NewOrOpen("activitypub", queuePath, 1000, apRequestBuilder) if err != nil { @@ -52,18 +56,18 @@ func startAPSendQueue() { } if r, ok := rInterface.(*apRequest); ok { if r.LastTry != 0 && time.Now().Before(time.Unix(r.LastTry, 0).Add(time.Duration(r.Try)*10*time.Minute)) { - apQueue.Enqueue(r) + _ = apQueue.Enqueue(r) } else { // Send request if err := apSendSigned(r.BlogIri, r.To, r.Activity); err != nil { if r.Try++; r.Try < 21 { // Try it again r.LastTry = time.Now().Unix() - apQueue.Enqueue(r) + _ = apQueue.Enqueue(r) } else { log.Printf("Request to %s failed for the 20th time", r.To) log.Println() - apRemoveInbox(r.To) + _ = apRemoveInbox(r.To) } } } diff --git a/authentication.go b/authentication.go index bc7af9e..4d7ffa9 100644 --- a/authentication.go +++ b/authentication.go @@ -79,7 +79,7 @@ func checkLogin(w http.ResponseWriter, r *http.Request) bool { // Copy original headers loginheaders, _ := base64.StdEncoding.DecodeString(r.FormValue("loginheaders")) var headers http.Header - json.Unmarshal(loginheaders, &headers) + _ = json.Unmarshal(loginheaders, &headers) for k, v := range headers { req.Header[k] = v } diff --git a/blogs.go b/blogs.go index 2d5bb03..d36efaf 100644 --- a/blogs.go +++ b/blogs.go @@ -11,7 +11,3 @@ func (blog *configBlog) getRelativePath(path string) string { } return path } - -func getBlogRelativePath(blog, path string) string { - return appConfig.Blogs[blog].getRelativePath(path) -} diff --git a/blogstats.go b/blogstats.go index 6b67ebe..d4d07d2 100644 --- a/blogstats.go +++ b/blogstats.go @@ -18,14 +18,12 @@ func serveBlogStats(blog, statsPath string) func(w http.ResponseWriter, r *http. return } var totalCount int - err = row.Scan(&totalCount) - if err != nil { + if err = row.Scan(&totalCount); err != nil { serveError(w, r, err.Error(), http.StatusInternalServerError) return } // Count posts per year - rows, err := appDbQuery(`select substr(published, 1, 4) as year, count(distinct path) as count from (`+query+`) - where published != '' group by year order by year desc`, params...) + rows, err := appDbQuery("select substr(published, 1, 4) as year, count(distinct path) as count from ("+query+") where published != '' group by year order by year desc", params...) if err != nil { serveError(w, r, err.Error(), http.StatusInternalServerError) return @@ -33,9 +31,10 @@ func serveBlogStats(blog, statsPath string) func(w http.ResponseWriter, r *http. var years, counts []int for rows.Next() { var year, count int - rows.Scan(&year, &count) - years = append(years, year) - counts = append(counts, count) + if err = rows.Scan(&year, &count); err == nil { + years = append(years, year) + counts = append(counts, count) + } } render(w, templateBlogStats, &renderData{ BlogString: blog, diff --git a/cache.go b/cache.go index dcd60ba..ac261d3 100644 --- a/cache.go +++ b/cache.go @@ -69,7 +69,6 @@ func cacheMiddleware(next http.Handler) http.Handler { return } next.ServeHTTP(w, r) - return }) } diff --git a/captcha.go b/captcha.go index e3dac89..5a4961f 100644 --- a/captcha.go +++ b/captcha.go @@ -13,9 +13,6 @@ import ( "github.com/dgrijalva/jwt-go" ) -func initCaptcha() { -} - func captchaMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { // 1. Check JWT @@ -67,7 +64,7 @@ func checkCaptcha(w http.ResponseWriter, r *http.Request) bool { // Copy original headers captchaheaders, _ := base64.StdEncoding.DecodeString(r.FormValue("captchaheaders")) var headers http.Header - json.Unmarshal(captchaheaders, &headers) + _ = json.Unmarshal(captchaheaders, &headers) for k, v := range headers { req.Header[k] = v } diff --git a/comments.go b/comments.go index 5c39105..d26e58e 100644 --- a/comments.go +++ b/comments.go @@ -75,12 +75,16 @@ func createComment(blog, commentsPath string) func(http.ResponseWriter, *http.Re serveError(w, r, err.Error(), http.StatusInternalServerError) return } - commentID, err := result.LastInsertId() - commentAddress := fmt.Sprintf("%s/%d", commentsPath, commentID) - // Send webmention - createWebmention(appConfig.Server.PublicAddress+commentAddress, appConfig.Server.PublicAddress+target) - // Redirect to comment - http.Redirect(w, r, commentAddress, http.StatusFound) + if commentID, err := result.LastInsertId(); err != nil { + // Serve error + serveError(w, r, err.Error(), http.StatusInternalServerError) + } else { + commentAddress := fmt.Sprintf("%s/%d", commentsPath, commentID) + // Send webmention + _ = createWebmention(appConfig.Server.PublicAddress+commentAddress, appConfig.Server.PublicAddress+target) + // Redirect to comment + http.Redirect(w, r, commentAddress, http.StatusFound) + } } } @@ -148,7 +152,6 @@ func commentsAdminDelete(w http.ResponseWriter, r *http.Request) { } purgeCache() http.Redirect(w, r, ".", http.StatusFound) - return } func deleteComment(id int) error { diff --git a/editor.go b/editor.go index 11f7c01..856bbbd 100644 --- a/editor.go +++ b/editor.go @@ -104,5 +104,5 @@ func editorMicropubPost(w http.ResponseWriter, r *http.Request, media bool) { } w.WriteHeader(result.StatusCode) body, _ := ioutil.ReadAll(result.Body) - w.Write(body) + _, _ = w.Write(body) } diff --git a/go.sum b/go.sum index f5d72cf..9749fef 100644 --- a/go.sum +++ b/go.sum @@ -23,7 +23,6 @@ github.com/PuerkitoBio/goquery v1.6.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBK github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= -github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE= github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY= @@ -40,7 +39,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/caddyserver/certmagic v0.12.0 h1:1f7kxykaJkOVVpXJ8ZrC6RAO5F6+kKm9U7dBFbLNeug= github.com/caddyserver/certmagic v0.12.0/go.mod h1:tr26xh+9fY5dN0J6IPAlMj07qpog22PJKa7Nw7j835U= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= github.com/chris-ramon/douceur v0.2.0 h1:IDMEdxlEUUBYBKE4z/mJnFyVXox+MjuEVDJNN27glkU= @@ -64,7 +62,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -77,12 +74,10 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gofrs/flock v0.7.1 h1:DP+LD/t0njgoPBvT5MJLeliUIVQR03hiKR6vezdwHlc= github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY= github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= @@ -102,7 +97,6 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -112,7 +106,6 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20210202160940-bed99a852dfe h1:rcf1P0fm+1l0EjG16p06mYLj9gW9X36KgdHJ/88hS4g= github.com/gopherjs/gopherjs v0.0.0-20210202160940-bed99a852dfe/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -151,10 +144,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/jeremywohl/flatten v1.0.1 h1:LrsxmB3hfwJuE+ptGOijix1PIfOoKLJ3Uee/mzbgtrs= github.com/jeremywohl/flatten v1.0.1/go.mod h1:4AmD/VxjWcI5SRB0n6szE2A6s2fsNHDLO0nAlMHgfLQ= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= @@ -167,20 +158,17 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid v1.2.5 h1:VBd9MyVIiJHzzgnrLQG5Bcv75H4YaWrlKqWHjurxCGo= github.com/klauspost/cpuid v1.2.5/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s= github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= @@ -194,7 +182,6 @@ github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkL github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA= github.com/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8= github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g= -github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= @@ -202,7 +189,6 @@ github.com/libdns/libdns v0.1.0 h1:0ctCOrVJsVzj53mop1angHp/pE3hmAhP7KiHvR0HD04= github.com/libdns/libdns v0.1.0/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40= github.com/lopezator/migrator v0.3.0 h1:VW/rR+J8NYwPdkBxjrFdjwejpgvP59LbmANJxXuNbuk= github.com/lopezator/migrator v0.3.0/go.mod h1:bpVAVPkWSvTw8ya2Pk7E/KiNAyDWNImgivQY79o8/8I= -github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= @@ -213,16 +199,13 @@ github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mholt/acmez v0.1.1 h1:KQODCqk+hBn3O7qfCRPj6L96uG65T5BSS95FKNEqtdA= github.com/mholt/acmez v0.1.1/go.mod h1:8qnn8QA/Ewx8E3ZSsmscqsIjhhpxuy9vqdgbX2ceceM= github.com/mholt/acmez v0.1.3 h1:J7MmNIk4Qf9b8mAGqAh4XkNeowv3f1zW816yf4zt7Qk= github.com/mholt/acmez v0.1.3/go.mod h1:8qnn8QA/Ewx8E3ZSsmscqsIjhhpxuy9vqdgbX2ceceM= github.com/microcosm-cc/bluemonday v1.0.4 h1:p0L+CTpo/PLFdkoPcJemLXG+fpMD7pYOoDEq1axMbGg= github.com/microcosm-cc/bluemonday v1.0.4/go.mod h1:8iwZnFn2CDDNZ0r6UXhF4xawGvzaqzCRa1n3/lO3W2w= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.30 h1:Qww6FseFn8PRfw07jueqIXqodm0JKiiKuK0DeXSqfyo= github.com/miekg/dns v1.1.30/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.38 h1:MtIY+fmHUVVgv1AXzmKMWcwdCYxTRPG1EDjpqF4RCEw= github.com/miekg/dns v1.1.38/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= @@ -232,7 +215,6 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -241,12 +223,10 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -270,7 +250,6 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= @@ -282,19 +261,15 @@ github.com/snabb/sitemap v1.0.0 h1:7vJeNPAaaj7fQSRS3WYuJHzUjdnhLdSLLpvVtnhbzC0= github.com/snabb/sitemap v1.0.0/go.mod h1:Id8uz1+WYdiNmSjEi4BIvL5UwNPYLsTHzRbjmDwNDzA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.5.1 h1:VHu76Lk0LSP1x254maIu2bplkWpfBWI+B+6fdoZprcg= github.com/spf13/afero v1.5.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -303,7 +278,6 @@ github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= @@ -322,7 +296,6 @@ github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod h1:iFy github.com/vcraescu/go-paginator v1.0.1-0.20201114172518-2cfc59fe05c2 h1:l5j4nE6rosbObXB/uPmzxOQ2z5uXlFOgttlHJ2YL/0w= github.com/vcraescu/go-paginator v1.0.1-0.20201114172518-2cfc59fe05c2/go.mod h1:NEDNuq1asYbAeX+uy6w56MDQSFmBQz9k+N9Hy6m4r2U= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.2 h1:YjHC5TgyMmHpicTgEqDN0Q96Xo8K6tLXPnmNOHXCgs0= github.com/yuin/goldmark v1.3.2/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= @@ -332,19 +305,15 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= @@ -355,7 +324,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY= @@ -373,7 +341,6 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= @@ -382,7 +349,6 @@ golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCc golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -415,9 +381,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -438,15 +402,12 @@ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c= golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= @@ -454,7 +415,6 @@ golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -480,14 +440,12 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -514,13 +472,11 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -528,11 +484,9 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -542,7 +496,6 @@ gorm.io/gorm v1.20.2/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.1.1 h1:EVDuO03OCZwpV2t/tLLxPmPiomagMoBOgfPt0FM+4IY= honnef.co/go/tools v0.1.1/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= diff --git a/hooks.go b/hooks.go index 8d0508a..58ec0d1 100644 --- a/hooks.go +++ b/hooks.go @@ -71,10 +71,6 @@ func (p *post) postDeleteHooks() { } } -type hookTemplateData struct { - URL string -} - func executeTemplateCommand(hookType string, tmpl string, data map[string]interface{}) { cmdTmpl, err := template.New("cmd").Parse(tmpl) if err != nil { @@ -82,7 +78,10 @@ func executeTemplateCommand(hookType string, tmpl string, data map[string]interf return } var cmdBuf bytes.Buffer - cmdTmpl.Execute(&cmdBuf, data) + if err = cmdTmpl.Execute(&cmdBuf, data); err != nil { + log.Println("Failed to execute cmd template:", err.Error()) + return + } cmd := cmdBuf.String() log.Println("Executing "+hookType+" hook:", cmd) executeCommand(cmd) diff --git a/indieAuth.go b/indieAuth.go index 39f7ab9..c5bbcd8 100644 --- a/indieAuth.go +++ b/indieAuth.go @@ -6,6 +6,8 @@ import ( "strings" ) +const indieAuthScope requestContextKey = "scope" + func checkIndieAuth(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { bearerToken := r.Header.Get("Authorization") @@ -17,14 +19,12 @@ func checkIndieAuth(next http.Handler) http.Handler { serveError(w, r, err.Error(), http.StatusUnauthorized) return } - next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), "scope", strings.Join(tokenData.Scopes, " ")))) - return + next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), indieAuthScope, strings.Join(tokenData.Scopes, " ")))) }) } func addAllScopes(next http.Handler) http.Handler { return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { - next.ServeHTTP(rw, r.WithContext(context.WithValue(r.Context(), "scope", "create update delete media"))) - return + next.ServeHTTP(rw, r.WithContext(context.WithValue(r.Context(), indieAuthScope, "create update delete media"))) }) } diff --git a/indieAuthServer.go b/indieAuthServer.go index 5cf2ef0..739dbb9 100644 --- a/indieAuthServer.go +++ b/indieAuthServer.go @@ -29,7 +29,10 @@ type indieAuthData struct { func indieAuthRequest(w http.ResponseWriter, r *http.Request) { // Authorization request - r.ParseForm() + if err := r.ParseForm(); err != nil { + serveError(w, r, err.Error(), http.StatusBadRequest) + return + } data := &indieAuthData{ ClientID: r.Form.Get("client_id"), RedirectURI: r.Form.Get("redirect_uri"), @@ -78,7 +81,10 @@ func isValidProfileURL(profileURL string) bool { func indieAuthAccept(w http.ResponseWriter, r *http.Request) { // Authentication flow - r.ParseForm() + if err := r.ParseForm(); err != nil { + serveError(w, r, err.Error(), http.StatusBadRequest) + return + } data := &indieAuthData{ ClientID: r.Form.Get("client_id"), RedirectURI: r.Form.Get("redirect_uri"), @@ -87,7 +93,10 @@ func indieAuthAccept(w http.ResponseWriter, r *http.Request) { time: time.Now(), } sha := sha1.New() - sha.Write([]byte(data.time.String() + data.ClientID)) + if _, err := sha.Write([]byte(data.time.String() + data.ClientID)); err != nil { + serveError(w, r, err.Error(), http.StatusInternalServerError) + return + } data.code = fmt.Sprintf("%x", sha.Sum(nil)) err := data.saveAuthorization() if err != nil { @@ -107,7 +116,10 @@ type tokenResponse struct { func indieAuthVerification(w http.ResponseWriter, r *http.Request) { // Authorization verification - r.ParseForm() + if err := r.ParseForm(); err != nil { + serveError(w, r, err.Error(), http.StatusBadRequest) + return + } data := &indieAuthData{ code: r.Form.Get("code"), ClientID: r.Form.Get("client_id"), @@ -156,7 +168,10 @@ func indieAuthToken(w http.ResponseWriter, r *http.Request) { } return } else if r.Method == http.MethodPost { - r.ParseForm() + if err := r.ParseForm(); err != nil { + serveError(w, r, err.Error(), http.StatusBadRequest) + return + } // Token Revocation if r.Form.Get("action") == "revoke" { revokeIndieAuthToken(r.Form.Get("token")) @@ -185,7 +200,10 @@ func indieAuthToken(w http.ResponseWriter, r *http.Request) { } data.time = time.Now() sha := sha1.New() - sha.Write([]byte(data.time.String() + data.ClientID)) + if _, err := sha.Write([]byte(data.time.String() + data.ClientID)); err != nil { + serveError(w, r, err.Error(), http.StatusInternalServerError) + return + } data.token = fmt.Sprintf("%x", sha.Sum(nil)) err = data.saveToken() if err != nil { @@ -269,9 +287,7 @@ func verifyIndieAuthToken(token string) (data *indieAuthData, err error) { } func revokeIndieAuthToken(token string) { - if token == "" { - return + if token != "" { + _, _ = appDbExec("delete from indieauthtoken where token=?", token) } - _, _ = appDbExec("delete from indieauthtoken where token=?", token) - return } diff --git a/micropub.go b/micropub.go index ac3f076..5cec322 100644 --- a/micropub.go +++ b/micropub.go @@ -179,7 +179,7 @@ func serveMicropubPost(w http.ResponseWriter, r *http.Request) { serveError(w, r, "wrong content type", http.StatusBadRequest) return } - if !strings.Contains(r.Context().Value("scope").(string), "create") { + if !strings.Contains(r.Context().Value(indieAuthScope).(string), "create") { serveError(w, r, "create scope missing", http.StatusForbidden) return } @@ -189,7 +189,6 @@ func serveMicropubPost(w http.ResponseWriter, r *http.Request) { return } http.Redirect(w, r, p.fullURL(), http.StatusAccepted) - return } func convertMPValueMapToPost(values map[string][]string) (*post, error) { @@ -258,7 +257,7 @@ type micropubAction string const ( actionUpdate micropubAction = "update" - actionDelete = "delete" + actionDelete micropubAction = "delete" ) type microformatItem struct { @@ -429,7 +428,7 @@ func (p *post) computeExtraPostParameters() error { } func micropubDelete(w http.ResponseWriter, r *http.Request, u *url.URL) { - if !strings.Contains(r.Context().Value("scope").(string), "delete") { + if !strings.Contains(r.Context().Value(indieAuthScope).(string), "delete") { serveError(w, r, "delete scope missing", http.StatusForbidden) return } @@ -438,11 +437,10 @@ func micropubDelete(w http.ResponseWriter, r *http.Request, u *url.URL) { return } http.Redirect(w, r, u.String(), http.StatusNoContent) - return } func micropubUpdate(w http.ResponseWriter, r *http.Request, u *url.URL, mf *microformatItem) { - if !strings.Contains(r.Context().Value("scope").(string), "update") { + if !strings.Contains(r.Context().Value(indieAuthScope).(string), "update") { serveError(w, r, "update scope missing", http.StatusForbidden) return } diff --git a/micropubMedia.go b/micropubMedia.go index ece59fd..8aa3d43 100644 --- a/micropubMedia.go +++ b/micropubMedia.go @@ -21,7 +21,7 @@ import ( const micropubMediaSubPath = "/media" func serveMicropubMedia(w http.ResponseWriter, r *http.Request) { - if !strings.Contains(r.Context().Value("scope").(string), "media") { + if !strings.Contains(r.Context().Value(indieAuthScope).(string), "media") { serveError(w, r, "media scope missing", http.StatusForbidden) return } diff --git a/postAliases.go b/postAliases.go index da3257d..e135cf5 100644 --- a/postAliases.go +++ b/postAliases.go @@ -26,8 +26,7 @@ func servePostAlias(w http.ResponseWriter, r *http.Request) { return } var path string - err = row.Scan(&path) - if err == sql.ErrNoRows { + if err := row.Scan(&path); err == sql.ErrNoRows { serve404(w, r) return } else if err != nil { @@ -35,5 +34,4 @@ func servePostAlias(w http.ResponseWriter, r *http.Request) { return } http.Redirect(w, r, path, http.StatusFound) - return } diff --git a/postsDb.go b/postsDb.go index e2591b4..54ab48b 100644 --- a/postsDb.go +++ b/postsDb.go @@ -229,7 +229,6 @@ func deletePost(path string) error { func rebuildFTSIndex() { _, _ = appDbExec("insert into posts_fts(posts_fts) values ('rebuild')") - return } func getPost(path string) (*post, error) { diff --git a/render.go b/render.go index 5e40db8..2c92f87 100644 --- a/render.go +++ b/render.go @@ -213,19 +213,19 @@ func initRendering() error { templates = map[string]*template.Template{} baseTemplatePath := path.Join(templatesDir, templateBase+templatesExt) - err := filepath.Walk(templatesDir, func(p string, info os.FileInfo, err error) error { + if err := filepath.Walk(templatesDir, func(p string, info os.FileInfo, err error) error { + if err != nil { + return err + } if info.Mode().IsRegular() && path.Ext(p) == templatesExt { - name := strings.TrimSuffix(path.Base(p), templatesExt) - if name != templateBase { - templates[name], err = template.New(name).Funcs(templateFunctions).ParseFiles(baseTemplatePath, p) - if err != nil { + if name := strings.TrimSuffix(path.Base(p), templatesExt); name != templateBase { + if templates[name], err = template.New(name).Funcs(templateFunctions).ParseFiles(baseTemplatePath, p); err != nil { return err } } } return nil - }) - if err != nil { + }); err != nil { return err } return nil diff --git a/robotstxt.go b/robotstxt.go index 83810f5..878b3dc 100644 --- a/robotstxt.go +++ b/robotstxt.go @@ -6,6 +6,5 @@ import ( ) func serveRobotsTXT(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusOK) - w.Write([]byte(fmt.Sprintf("User-agent: *\nSitemap: %v", appConfig.Server.PublicAddress+sitemapPath))) + _, _ = w.Write([]byte(fmt.Sprintf("User-agent: *\nSitemap: %v", appConfig.Server.PublicAddress+sitemapPath))) } diff --git a/telegram.go b/telegram.go index 7731151..b251159 100644 --- a/telegram.go +++ b/telegram.go @@ -3,6 +3,8 @@ package main import ( "bytes" "errors" + "fmt" + "log" "net/http" "net/url" ) @@ -36,7 +38,9 @@ func (p *post) tgPost() { message.WriteString("\n\n") } message.WriteString(p.shortURL()) - sendTelegramMessage(message.String(), tg.BotToken, tg.ChatID) + if err := sendTelegramMessage(message.String(), tg.BotToken, tg.ChatID); err != nil { + log.Println(err.Error()) + } } func sendTelegramMessage(text, bottoken, chatID string) error { @@ -50,8 +54,10 @@ func sendTelegramMessage(text, bottoken, chatID string) error { tgURL.RawQuery = params.Encode() req, _ := http.NewRequest(http.MethodPost, tgURL.String(), nil) resp, err := http.DefaultClient.Do(req) - if err != nil || resp.StatusCode != http.StatusOK { - return errors.New("failed to send Telegram message") + if err != nil { + return err + } else if resp.StatusCode != http.StatusOK { + return fmt.Errorf("failed to send Telegram message, status code %d", resp.StatusCode) } return nil } diff --git a/templateAssets.go b/templateAssets.go index f1a45d4..5b317da 100644 --- a/templateAssets.go +++ b/templateAssets.go @@ -41,10 +41,10 @@ func initTemplateAssets() (err error) { return nil } -func compileAsset(name string) (compiledFileName string, err error) { +func compileAsset(name string) (string, error) { originalContent, err := ioutil.ReadFile(name) if err != nil { - return + return "", err } ext := path.Ext(name) var compiledContent []byte @@ -53,26 +53,28 @@ func compileAsset(name string) (compiledFileName string, err error) { case ".js": compiledContent, err = minifier.Bytes("application/javascript", originalContent) if err != nil { - return + return "", err } case ".css": compiledContent, err = minifier.Bytes("text/css", originalContent) if err != nil { - return + return "", err } default: // Just copy the file compiledContent = originalContent } sha := sha1.New() - sha.Write(compiledContent) + if _, err := sha.Write(compiledContent); err != nil { + return "", err + } hash := fmt.Sprintf("%x", sha.Sum(nil)) - compiledFileName = hash + compiledExt + compiledFileName := hash + compiledExt assetFiles[compiledFileName] = &assetFile{ contentType: mime.TypeByExtension(compiledExt), body: compiledContent, } - return + return compiledFileName, err } // Function for templates @@ -90,13 +92,12 @@ func allAssetPaths() []string { // Gets only called by registered paths func serveAsset(w http.ResponseWriter, r *http.Request) { - f := strings.TrimPrefix(r.URL.Path, "/") - af, ok := assetFiles[f] + af, ok := assetFiles[strings.TrimPrefix(r.URL.Path, "/")] if !ok { serve404(w, r) return } w.Header().Set("Cache-Control", "public,max-age=31536000,immutable") w.Header().Set(contentType, af.contentType) - w.Write(af.body) + _, _ = w.Write(af.body) } diff --git a/utils.go b/utils.go index fba88e2..8c8f48b 100644 --- a/utils.go +++ b/utils.go @@ -13,6 +13,8 @@ import ( "github.com/araddon/dateparse" ) +type requestContextKey string + func urlize(str string) string { newStr := "" for _, c := range strings.Split(strings.ToLower(str), "") { diff --git a/webmention.go b/webmention.go index 9a4d277..cd665b1 100644 --- a/webmention.go +++ b/webmention.go @@ -39,7 +39,7 @@ func initWebmention() error { // Add hooks hookFunc := func(p *post) { if p.Status == statusPublished { - p.sendWebmentions() + _ = p.sendWebmentions() } } postHooks[postPostHook] = append(postHooks[postPostHook], hookFunc) @@ -145,7 +145,6 @@ func webmentionAdminDelete(w http.ResponseWriter, r *http.Request) { } purgeCache() http.Redirect(w, r, ".", http.StatusFound) - return } func webmentionAdminApprove(w http.ResponseWriter, r *http.Request) { @@ -161,7 +160,6 @@ func webmentionAdminApprove(w http.ResponseWriter, r *http.Request) { } purgeCache() http.Redirect(w, r, ".", http.StatusFound) - return } func webmentionExists(source, target string) bool { diff --git a/webmentionSending.go b/webmentionSending.go index 04c69a8..840b555 100644 --- a/webmentionSending.go +++ b/webmentionSending.go @@ -26,7 +26,9 @@ func (p *post) sendWebmentions() error { } if strings.HasPrefix(link, appConfig.Server.PublicAddress) { // Save mention directly - createWebmention(p.fullURL(), link) + if err := createWebmention(p.fullURL(), link); err != nil { + log.Println("Failed to create webmention:", err.Error()) + } continue } endpoint := discoverEndpoint(link) diff --git a/webmentionVerification.go b/webmentionVerification.go index 5726120..29b5af5 100644 --- a/webmentionVerification.go +++ b/webmentionVerification.go @@ -25,7 +25,11 @@ func wmMentionBuilder() interface{} { func initWebmentionQueue() (err error) { queuePath := "queues" if _, err := os.Stat(queuePath); os.IsNotExist(err) { - os.Mkdir(queuePath, 0755) + if err := os.Mkdir(queuePath, 0755); err != nil { + return err + } + } else if err != nil { + return err } wmQueue, err = dque.NewOrOpen("webmention", queuePath, 5, wmMentionBuilder) if err != nil { @@ -99,7 +103,9 @@ func (m *mention) verifyMention() error { func (m *mention) verifyReader(body io.Reader) error { var linksBuffer, gqBuffer, mfBuffer bytes.Buffer - io.Copy(io.MultiWriter(&linksBuffer, &gqBuffer, &mfBuffer), body) + if _, err := io.Copy(io.MultiWriter(&linksBuffer, &gqBuffer, &mfBuffer), body); err != nil { + return err + } // Check if source mentions target links, err := allLinksFromHTML(&linksBuffer, m.Source) if err != nil {