Modernize Backend Go App
* Remove Negroni in favor of the standard net/http server. * Remove gorilla/mux in favor of the standard net/http NewServeMux. * Remove gorilla/sessions in favor of Redis session_id cookie. * Remove the hacky glue controllers setup in favor of regular defined routes in the router.go file directly. * Update all Go dependencies for Go 1.24 * Move and centralize all the HTTP middlewares. * Add middlewares for Logging and Recovery to replace Negroni's.
This commit is contained in:
parent
76f76df444
commit
898f82fb79
2
Makefile
2
Makefile
|
|
@ -30,7 +30,7 @@ install:
|
|||
# `make run` to run it in debug mode.
|
||||
.PHONY: run
|
||||
run:
|
||||
go run cmd/gophertype/main.go -debug -sqlite database.sqlite -root ./public_html
|
||||
go run cmd/gophertype/main.go -debug -sqlite3 database.sqlite -root ./public_html
|
||||
|
||||
# `make test` to run unit tests.
|
||||
.PHONY: test
|
||||
|
|
|
|||
42
go.mod
42
go.mod
|
|
@ -1,55 +1,53 @@
|
|||
module git.kirsle.net/apps/gophertype
|
||||
|
||||
go 1.19
|
||||
go 1.23.0
|
||||
|
||||
toolchain go1.24.2
|
||||
|
||||
require (
|
||||
github.com/albrow/forms v0.3.3
|
||||
github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f
|
||||
github.com/edwvee/exiffix v0.0.0-20240229113213-0dbb146775be
|
||||
github.com/go-redis/redis/v8 v8.11.5
|
||||
github.com/gorilla/feeds v1.1.1
|
||||
github.com/gorilla/mux v1.8.0
|
||||
github.com/gorilla/sessions v1.2.1
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/gorilla/feeds v1.2.0
|
||||
github.com/jinzhu/gorm v1.9.16
|
||||
github.com/kirsle/blog v0.0.0-20191022175051-d78814b9c99b
|
||||
github.com/kirsle/golog v0.0.0-20180411020913-51290b4f9292
|
||||
github.com/microcosm-cc/bluemonday v1.0.24
|
||||
github.com/microcosm-cc/bluemonday v1.0.27
|
||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
|
||||
github.com/satori/go.uuid v1.2.0
|
||||
github.com/shurcooL/github_flavored_markdown v0.0.0-20210228213109-c3a9aa474629
|
||||
github.com/urfave/negroni v1.0.0
|
||||
golang.org/x/crypto v0.10.0
|
||||
golang.org/x/crypto v0.36.0
|
||||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
|
||||
)
|
||||
|
||||
require (
|
||||
filippo.io/edwards25519 v1.1.0 // indirect
|
||||
github.com/aymerick/douceur v0.2.0 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||
github.com/disintegration/imaging v1.6.2 // indirect
|
||||
github.com/go-sql-driver/mysql v1.7.1 // indirect
|
||||
github.com/google/uuid v1.3.0 // indirect
|
||||
github.com/gorilla/css v1.0.0 // indirect
|
||||
github.com/gorilla/securecookie v1.1.1 // indirect
|
||||
github.com/go-sql-driver/mysql v1.9.1 // indirect
|
||||
github.com/gorilla/css v1.0.1 // indirect
|
||||
github.com/jinzhu/inflection v1.0.0 // indirect
|
||||
github.com/kr/pretty v0.2.1 // indirect
|
||||
github.com/lib/pq v1.10.9 // indirect
|
||||
github.com/mattn/go-sqlite3 v1.14.17 // indirect
|
||||
github.com/mattn/go-sqlite3 v1.14.27 // indirect
|
||||
github.com/russross/blackfriday v1.6.0 // indirect
|
||||
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect
|
||||
github.com/sergi/go-diff v1.3.1 // indirect
|
||||
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 // indirect
|
||||
github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17 // indirect
|
||||
github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 // indirect
|
||||
github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b // indirect
|
||||
github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c // indirect
|
||||
github.com/shurcooL/highlight_diff v0.0.0-20230708024848-22f825814995 // indirect
|
||||
github.com/shurcooL/highlight_go v0.0.0-20230708025100-33e05792540a // indirect
|
||||
github.com/shurcooL/octicon v0.0.0-20230705024016-66bff059edb8 // indirect
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
|
||||
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
|
||||
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
|
||||
github.com/stretchr/testify v1.8.1 // indirect
|
||||
github.com/tomnomnom/xtermcolor v0.0.0-20160428124646-b78803f00a7e // indirect
|
||||
golang.org/x/image v0.8.0 // indirect
|
||||
golang.org/x/net v0.11.0 // indirect
|
||||
golang.org/x/sys v0.9.0 // indirect
|
||||
golang.org/x/term v0.9.0 // indirect
|
||||
golang.org/x/image v0.25.0 // indirect
|
||||
golang.org/x/net v0.38.0 // indirect
|
||||
golang.org/x/sys v0.31.0 // indirect
|
||||
golang.org/x/term v0.30.0 // indirect
|
||||
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
|
||||
)
|
||||
|
|
|
|||
114
go.sum
114
go.sum
|
|
@ -1,6 +1,8 @@
|
|||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
|
||||
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
|
||||
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
|
||||
|
|
@ -14,8 +16,8 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
|
|||
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
|
||||
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
|
|
@ -32,12 +34,13 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
|
|||
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
|
||||
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
|
||||
github.com/edwvee/exiffix v0.0.0-20180602190213-b57537c92a6b/go.mod h1:KoE3Ti1qbQXCb3s/XGj0yApHnbnNnn1bXTtB5Auq/Vc=
|
||||
github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f h1:RMnUwTnNR070mFAEIoqMYjNirHj8i0h79VXTYyBCyVA=
|
||||
github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f/go.mod h1:KoE3Ti1qbQXCb3s/XGj0yApHnbnNnn1bXTtB5Auq/Vc=
|
||||
github.com/edwvee/exiffix v0.0.0-20240229113213-0dbb146775be h1:FNPYI8/ifKGW7kdBdlogyGGaPXZmOXBbV1uz4Amr3s0=
|
||||
github.com/edwvee/exiffix v0.0.0-20240229113213-0dbb146775be/go.mod h1:G3dK5MziX9e4jUa8PWjowCOPCcyQwxsZ5a0oYA73280=
|
||||
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
|
||||
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
|
||||
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=
|
||||
github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
|
||||
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=
|
||||
|
|
@ -45,8 +48,8 @@ github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC
|
|||
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
|
||||
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
|
||||
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
|
||||
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
|
||||
github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtSb/iI=
|
||||
github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
|
|
@ -62,23 +65,19 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
|
|||
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
|
||||
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
|
||||
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
||||
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
||||
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
|
||||
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
|
||||
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
|
||||
github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY=
|
||||
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
|
||||
github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
|
||||
github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
|
||||
github.com/gorilla/feeds v1.2.0 h1:O6pBiXJ5JHhPvqy53NsjKOThq+dNFm8+DFrxBEdzSCc=
|
||||
github.com/gorilla/feeds v1.2.0/go.mod h1:WMib8uJP3BbY+X8Szd1rA5Pzhdfh+HCCAYT2z7Fza6Y=
|
||||
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
||||
github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
||||
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
|
||||
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
|
||||
github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
|
||||
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
|
||||
github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
|
||||
github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
|
||||
github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
|
||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
github.com/jinzhu/gorm v1.9.9/go.mod h1:Kh6hTsSGffh4ui079FHrR5Gg+5D0hgihqDcsDN2BBJY=
|
||||
|
|
@ -98,31 +97,35 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
|
|||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
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/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
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=
|
||||
github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
|
||||
github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
|
||||
github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
|
||||
github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
|
||||
github.com/mattn/go-sqlite3 v1.14.27 h1:drZCnuvf37yPfs95E5jd9s3XhdVWLal+6BOK6qrv6IU=
|
||||
github.com/mattn/go-sqlite3 v1.14.27/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||
github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
|
||||
github.com/microcosm-cc/bluemonday v1.0.24 h1:NGQoPtwGVcbGkKfvyYk1yRqknzBuoMiUrO6R7uFTPlw=
|
||||
github.com/microcosm-cc/bluemonday v1.0.24/go.mod h1:ArQySAMps0790cHSkdPEJ7bGkF2VePWH773hsJNSHf8=
|
||||
github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
|
||||
github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
|
||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
|
||||
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
|
||||
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
|
||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
|
||||
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
|
||||
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
|
||||
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
|
||||
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
|
||||
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
|
||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
|
|
@ -136,6 +139,8 @@ github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
|
|||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
|
||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
|
||||
github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
|
||||
github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
|
||||
|
|
@ -153,14 +158,15 @@ github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 h1:aSISeOcal5irEhJd1M+
|
|||
github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
|
||||
github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17 h1:lRAUE0dIvigSSFAmaM2dfg7OH8T+a8zJ5smEh09a/GI=
|
||||
github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
|
||||
github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 h1:KaKXZldeYH73dpQL+Nr38j1r5BgpAYQjYvENOUpIZDQ=
|
||||
github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
|
||||
github.com/shurcooL/highlight_diff v0.0.0-20230708024848-22f825814995 h1:/6Fa0HAouqks/nlr3C3sv7KNDqutP3CM/MYz225uO28=
|
||||
github.com/shurcooL/highlight_diff v0.0.0-20230708024848-22f825814995/go.mod h1:eqklBUMsamqZbxXhhr6GafgswFTa5Aq12VQ0I2lnCR8=
|
||||
github.com/shurcooL/highlight_go v0.0.0-20181215221002-9d8641ddf2e1/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
|
||||
github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b h1:rBIwpb5ggtqf0uZZY5BPs1sL7njUMM7I8qD2jiou70E=
|
||||
github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
|
||||
github.com/shurcooL/highlight_go v0.0.0-20230708025100-33e05792540a h1:aMmA4ghJXuzwIS/mEK+bf7U2WZECRxa3sPgR4QHj8Hw=
|
||||
github.com/shurcooL/highlight_go v0.0.0-20230708025100-33e05792540a/go.mod h1:kLtotffsKtKsCupV8wNnNwQQHBccB1Oy5VSg8P409Go=
|
||||
github.com/shurcooL/octicon v0.0.0-20181222203144-9ff1a4cf27f4/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
|
||||
github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c h1:p3w+lTqXulfa3aDeycxmcLJDNxyUB89gf2/XqqK3eO0=
|
||||
github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
|
||||
github.com/shurcooL/octicon v0.0.0-20230705024016-66bff059edb8 h1:W5meM/5DP0Igf+pS3Se363Y2DoDv9LUuZgQ24uG9LNY=
|
||||
github.com/shurcooL/octicon v0.0.0-20230705024016-66bff059edb8/go.mod h1:hWBWTvIJ918VxbNOk2hxQg1/5j1M9yQI1Kp8d9qrOq8=
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
|
|
@ -180,28 +186,23 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
|
|||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/tomnomnom/xtermcolor v0.0.0-20160428124646-b78803f00a7e h1:Ee+VZw13r9NTOMnwTPs6O5KZ0MJU54hsxu9FpZ4pQ10=
|
||||
github.com/tomnomnom/xtermcolor v0.0.0-20160428124646-b78803f00a7e/go.mod h1:fSIW/szJHsRts/4U8wlMPhs+YqJC+7NYR+Qqb1uJVpA=
|
||||
github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
|
||||
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
|
||||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
|
||||
golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
|
||||
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
|
||||
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
|
||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/image v0.8.0 h1:agUcRXV/+w6L9ryntYYsF2x9fQTMd4T8fiiYXAVW6Jg=
|
||||
golang.org/x/image v0.8.0/go.mod h1:PwLxp3opCYg4WR2WO9P0L6ESnsD6bLTWcw8zanLMVFM=
|
||||
golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
|
||||
golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
|
||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
|
|
@ -213,23 +214,16 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r
|
|||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||
golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
|
||||
golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
|
||||
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
|
||||
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
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/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
|
|
@ -238,35 +232,19 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h
|
|||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
|
||||
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||
golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
|
||||
golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
|
||||
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
|
||||
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
|
||||
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
|
||||
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.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
|
||||
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
|
||||
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
|
||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
|
|
|
|||
16
pkg/app.go
16
pkg/app.go
|
|
@ -10,15 +10,12 @@ import (
|
|||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
"git.kirsle.net/apps/gophertype/pkg/settings"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/jinzhu/gorm"
|
||||
"github.com/urfave/negroni"
|
||||
)
|
||||
|
||||
// Site is the master struct for the Gophertype server.
|
||||
type Site struct {
|
||||
n *negroni.Negroni
|
||||
mux *mux.Router
|
||||
mux http.Handler
|
||||
}
|
||||
|
||||
// NewSite initializes the Site.
|
||||
|
|
@ -30,11 +27,6 @@ func NewSite(pubroot string) *Site {
|
|||
|
||||
site := &Site{}
|
||||
|
||||
n := negroni.New()
|
||||
n.Use(negroni.NewRecovery())
|
||||
n.Use(negroni.NewLogger())
|
||||
site.n = n
|
||||
|
||||
// Register blog global template functions.
|
||||
responses.ExtraFuncs = template.FuncMap{
|
||||
"BlogIndex": controllers.PartialBlogIndex,
|
||||
|
|
@ -67,5 +59,9 @@ func (s *Site) SetupRedis() error {
|
|||
// ListenAndServe starts the HTTP service.
|
||||
func (s *Site) ListenAndServe(addr string) error {
|
||||
console.Info("Listening on %s", addr)
|
||||
return http.ListenAndServe(addr, s.n)
|
||||
server := http.Server{
|
||||
Addr: addr,
|
||||
Handler: s.mux,
|
||||
}
|
||||
return server.ListenAndServe()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package authentication
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
|
|
@ -13,18 +12,16 @@ import (
|
|||
// CurrentUser returns the currently logged-in user in the browser session.
|
||||
func CurrentUser(r *http.Request) (models.User, error) {
|
||||
sess := session.Get(r)
|
||||
if loggedIn, ok := sess.Values["logged-in"].(bool); ok && loggedIn {
|
||||
if id, ok := sess.Values["user-id"].(int); ok && id > 0 {
|
||||
user, err := models.Users.GetUserByID(id)
|
||||
if err != nil {
|
||||
console.Error("CurrentUser: user '%d' was not found in DB! Logging out the session", id)
|
||||
delete(sess.Values, "user-id")
|
||||
delete(sess.Values, "logged-in")
|
||||
return user, err
|
||||
}
|
||||
if sess.LoggedIn {
|
||||
id := sess.UserID
|
||||
user, err := models.Users.GetUserByID(id)
|
||||
if err != nil {
|
||||
console.Error("CurrentUser: user '%d' was not found in DB! Logging out the session", id)
|
||||
sess.LoggedIn = false
|
||||
sess.UserID = 0
|
||||
return user, err
|
||||
}
|
||||
return models.User{}, errors.New("not logged in")
|
||||
return user, err
|
||||
}
|
||||
return models.User{}, errors.New("not logged in")
|
||||
}
|
||||
|
|
@ -33,63 +30,21 @@ func CurrentUser(r *http.Request) (models.User, error) {
|
|||
func Login(w http.ResponseWriter, r *http.Request, user models.User) {
|
||||
sess := session.Get(r)
|
||||
|
||||
sess.Values["logged-in"] = true
|
||||
sess.Values["user-id"] = int(user.ID)
|
||||
if err := sess.Save(r, w); err != nil {
|
||||
console.Error("Login() Session error: " + err.Error())
|
||||
}
|
||||
sess.LoggedIn = true
|
||||
sess.UserID = user.ID
|
||||
sess.Save(w)
|
||||
}
|
||||
|
||||
// Logout logs the current user out.
|
||||
func Logout(w http.ResponseWriter, r *http.Request) {
|
||||
sess := session.Get(r)
|
||||
sess.Values["logged-in"] = false
|
||||
sess.Values["user-id"] = 0
|
||||
sess.Save(r, w)
|
||||
sess.LoggedIn = false
|
||||
sess.UserID = 0
|
||||
sess.Save(w)
|
||||
}
|
||||
|
||||
// LoggedIn returns whether the session is logged in as a user.
|
||||
func LoggedIn(r *http.Request) bool {
|
||||
sess := session.Get(r)
|
||||
if v, ok := sess.Values["logged-in"].(bool); ok && v == true {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// LoginRequired is a middleware for authenticated endpoints.
|
||||
func LoginRequired(next http.Handler) http.Handler {
|
||||
middleware := func(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
if user, ok := ctx.Value(session.UserKey).(models.User); ok {
|
||||
if user.ID > 0 {
|
||||
next.ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Redirect to the login page.
|
||||
w.Header().Set("Location", "/login?next="+r.URL.Path)
|
||||
w.WriteHeader(http.StatusFound)
|
||||
}
|
||||
|
||||
return http.HandlerFunc(middleware)
|
||||
}
|
||||
|
||||
// Middleware checks the authentication and loads the user onto the request context.
|
||||
func Middleware(next http.Handler) http.Handler {
|
||||
middleware := func(w http.ResponseWriter, r *http.Request) {
|
||||
user, err := CurrentUser(r)
|
||||
if err != nil {
|
||||
// User not logged in, go to next middleware.
|
||||
next.ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
// Put the CurrentUser into the request context.
|
||||
ctx := context.WithValue(r.Context(), session.UserKey, user)
|
||||
next.ServeHTTP(w, r.WithContext(ctx))
|
||||
}
|
||||
|
||||
return http.HandlerFunc(middleware)
|
||||
return sess.LoggedIn
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@ const (
|
|||
PasswordMinLength = 8
|
||||
BcryptCost = 14
|
||||
|
||||
SessionCookieName = "session_id"
|
||||
SessionRedisKeyFormat = "sessions/%s"
|
||||
SessionCookieMaxAge = 60 * 60 * 24 * 30
|
||||
|
||||
// Rate limits
|
||||
RateLimitRedisKey = "rate-limit/%s/%s" // namespace, id
|
||||
LoginRateLimitWindow = 1 * time.Hour
|
||||
|
|
|
|||
|
|
@ -3,19 +3,10 @@ package controllers
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
"git.kirsle.net/apps/gophertype/pkg/session"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/age-verify",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Handler: AgeVerify,
|
||||
})
|
||||
}
|
||||
|
||||
// AgeVerify handles the age gate prompt page for NSFW sites.
|
||||
func AgeVerify(w http.ResponseWriter, r *http.Request) {
|
||||
var (
|
||||
|
|
@ -32,8 +23,8 @@ func AgeVerify(w http.ResponseWriter, r *http.Request) {
|
|||
if r.Method == http.MethodPost {
|
||||
if confirm == "true" {
|
||||
session := session.Get(r)
|
||||
session.Values["age-ok"] = true
|
||||
session.Save(r, w)
|
||||
session.AgeOK = true
|
||||
session.Save(w)
|
||||
responses.Redirect(w, r, next)
|
||||
return
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import (
|
|||
"git.kirsle.net/apps/gophertype/pkg/authentication"
|
||||
"git.kirsle.net/apps/gophertype/pkg/console"
|
||||
"git.kirsle.net/apps/gophertype/pkg/constants"
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
"git.kirsle.net/apps/gophertype/pkg/ratelimit"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
|
|
@ -14,72 +13,63 @@ import (
|
|||
"github.com/albrow/forms"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/login",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Handler: func(w http.ResponseWriter, r *http.Request) {
|
||||
// Template variables.
|
||||
v := responses.NewTemplateVars(w, r)
|
||||
func Login(w http.ResponseWriter, r *http.Request) {
|
||||
// Template variables.
|
||||
v := responses.NewTemplateVars(w, r)
|
||||
|
||||
// POST handler: create the admin account.
|
||||
for r.Method == http.MethodPost {
|
||||
form, _ := forms.Parse(r)
|
||||
v.FormValues = form.Values
|
||||
// POST handler: create the admin account.
|
||||
for r.Method == http.MethodPost {
|
||||
form, _ := forms.Parse(r)
|
||||
v.FormValues = form.Values
|
||||
|
||||
// Validate form parameters.
|
||||
val := form.Validator()
|
||||
val.Require("email")
|
||||
val.MatchEmail("email")
|
||||
val.Require("password")
|
||||
if val.HasErrors() {
|
||||
v.ValidationError = val.ErrorMap()
|
||||
break
|
||||
}
|
||||
// Validate form parameters.
|
||||
val := form.Validator()
|
||||
val.Require("email")
|
||||
val.MatchEmail("email")
|
||||
val.Require("password")
|
||||
if val.HasErrors() {
|
||||
v.ValidationError = val.ErrorMap()
|
||||
break
|
||||
}
|
||||
|
||||
// Rate limit failed login attempts.
|
||||
limiter := &ratelimit.Limiter{
|
||||
Namespace: "login",
|
||||
ID: form.Get("email"),
|
||||
Limit: constants.LoginRateLimit,
|
||||
Window: constants.LoginRateLimitWindow,
|
||||
CooldownAt: constants.LoginRateLimitCooldownAt,
|
||||
Cooldown: constants.LoginRateLimitCooldown,
|
||||
}
|
||||
// Rate limit failed login attempts.
|
||||
limiter := &ratelimit.Limiter{
|
||||
Namespace: "login",
|
||||
ID: form.Get("email"),
|
||||
Limit: constants.LoginRateLimit,
|
||||
Window: constants.LoginRateLimitWindow,
|
||||
CooldownAt: constants.LoginRateLimitCooldownAt,
|
||||
Cooldown: constants.LoginRateLimitCooldown,
|
||||
}
|
||||
|
||||
// Check authentication.
|
||||
user, err := models.Users.AuthenticateUser(form.Get("email"), form.Get("password"))
|
||||
if err != nil {
|
||||
if err := limiter.Ping(); err != nil {
|
||||
v.Error = err
|
||||
break
|
||||
}
|
||||
v.Error = err
|
||||
break
|
||||
}
|
||||
|
||||
if err := limiter.Clear(); err != nil {
|
||||
console.Error("Failed to clear the login rate limiter: %s", err)
|
||||
}
|
||||
|
||||
_ = user
|
||||
|
||||
authentication.Login(w, r, user)
|
||||
session.Flash(w, r, "Signed in!")
|
||||
responses.Redirect(w, r, "/") // TODO: next URL
|
||||
return
|
||||
// Check authentication.
|
||||
user, err := models.Users.AuthenticateUser(form.Get("email"), form.Get("password"))
|
||||
if err != nil {
|
||||
if err := limiter.Ping(); err != nil {
|
||||
v.Error = err
|
||||
break
|
||||
}
|
||||
v.Error = err
|
||||
break
|
||||
}
|
||||
|
||||
responses.RenderTemplate(w, r, "_builtin/users/login.gohtml", v)
|
||||
},
|
||||
})
|
||||
if err := limiter.Clear(); err != nil {
|
||||
console.Error("Failed to clear the login rate limiter: %s", err)
|
||||
}
|
||||
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/logout",
|
||||
Handler: func(w http.ResponseWriter, r *http.Request) {
|
||||
authentication.Logout(w, r)
|
||||
session.Flash(w, r, "Signed out!")
|
||||
responses.Redirect(w, r, "/")
|
||||
},
|
||||
})
|
||||
_ = user
|
||||
|
||||
authentication.Login(w, r, user)
|
||||
session.Flash(w, r, "Signed in!")
|
||||
responses.Redirect(w, r, "/") // TODO: next URL
|
||||
return
|
||||
}
|
||||
|
||||
responses.RenderTemplate(w, r, "_builtin/users/login.gohtml", v)
|
||||
}
|
||||
|
||||
func Logout(w http.ResponseWriter, r *http.Request) {
|
||||
authentication.Logout(w, r)
|
||||
session.Flash(w, r, "Signed out!")
|
||||
responses.Redirect(w, r, "/")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import (
|
|||
"strings"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/authentication"
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/mail"
|
||||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
|
|
@ -18,24 +17,6 @@ import (
|
|||
uuid "github.com/satori/go.uuid"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/comments",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Handler: PostComment,
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/comments/subscription",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Handler: ManageSubscription,
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/comments/quick-delete",
|
||||
Methods: []string{"GET"},
|
||||
Handler: CommentQuickDelete,
|
||||
})
|
||||
}
|
||||
|
||||
// RenderComments returns the partial comments HTML to embed on a page.
|
||||
func RenderComments(w http.ResponseWriter, r *http.Request, subject string, ids ...string) template.HTML {
|
||||
thread := strings.Join(ids, "-")
|
||||
|
|
@ -90,9 +71,11 @@ func renderComments(w http.ResponseWriter, r *http.Request, subject string, thre
|
|||
}
|
||||
|
||||
// Load their cached name and email from any previous comments the user posted.
|
||||
name, _ := ses.Values["c.name"].(string)
|
||||
email, _ := ses.Values["c.email"].(string)
|
||||
editToken, _ := ses.Values["c.token"].(string)
|
||||
var (
|
||||
name = ses.Name
|
||||
email = ses.Email
|
||||
editToken = ses.EditToken
|
||||
)
|
||||
|
||||
// Logged in? Populate defaults from the user info.
|
||||
if currentUser, err := authentication.CurrentUser(r); err == nil {
|
||||
|
|
@ -200,9 +183,9 @@ func PostComment(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
// Cache their name and email in their session, for future requests.
|
||||
ses.Values["c.email"] = form.Get("email")
|
||||
ses.Values["c.name"] = form.Get("name")
|
||||
ses.Save(r, w)
|
||||
ses.Email = form.Get("email")
|
||||
ses.Name = form.Get("name")
|
||||
ses.Save(w)
|
||||
|
||||
switch form.Get("submit") {
|
||||
case "delete":
|
||||
|
|
@ -316,12 +299,12 @@ func CommentQuickDelete(w http.ResponseWriter, r *http.Request) {
|
|||
// getEditToken gets the edit token from the user's session.
|
||||
func getEditToken(w http.ResponseWriter, r *http.Request) string {
|
||||
ses := session.Get(r)
|
||||
if token, ok := ses.Values["c.token"].(string); ok && len(token) > 0 {
|
||||
return token
|
||||
if ses.EditToken != "" {
|
||||
return ses.EditToken
|
||||
}
|
||||
|
||||
token := uuid.NewV4().String()
|
||||
ses.Values["c.token"] = token
|
||||
ses.Save(r, w)
|
||||
ses.EditToken = token
|
||||
ses.Save(w)
|
||||
return token
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import (
|
|||
"html/template"
|
||||
"net/http"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/mail"
|
||||
"git.kirsle.net/apps/gophertype/pkg/markdown"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
|
|
@ -14,14 +13,6 @@ import (
|
|||
"github.com/albrow/forms"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/contact",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Handler: ContactHandler,
|
||||
})
|
||||
}
|
||||
|
||||
// ContactHandler receives admin emails from users.
|
||||
func ContactHandler(w http.ResponseWriter, r *http.Request) {
|
||||
var (
|
||||
|
|
@ -30,8 +21,8 @@ func ContactHandler(w http.ResponseWriter, r *http.Request) {
|
|||
)
|
||||
|
||||
// Load their cached name from any previous comments they may have posted.
|
||||
name, _ := ses.Values["c.name"].(string)
|
||||
email, _ := ses.Values["c.email"].(string)
|
||||
name := ses.Name
|
||||
email := ses.Email
|
||||
|
||||
for r.Method == http.MethodPost {
|
||||
// Validate form parameters.
|
||||
|
|
@ -52,9 +43,9 @@ func ContactHandler(w http.ResponseWriter, r *http.Request) {
|
|||
)
|
||||
|
||||
// Cache their name in their session for future comments/asks.
|
||||
ses.Values["c.name"] = name
|
||||
ses.Values["c.email"] = email
|
||||
ses.Save(r, w)
|
||||
ses.Name = name
|
||||
ses.Email = email
|
||||
ses.Save(w)
|
||||
|
||||
// Email the site admin.
|
||||
if name == "" {
|
||||
|
|
|
|||
|
|
@ -2,31 +2,12 @@ package controllers
|
|||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/middleware"
|
||||
"github.com/gorilla/mux"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/admin",
|
||||
Middleware: []mux.MiddlewareFunc{
|
||||
middleware.ExampleMiddleware,
|
||||
},
|
||||
Handler: func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write([]byte("Admin index"))
|
||||
},
|
||||
})
|
||||
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/admin/users",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Middleware: []mux.MiddlewareFunc{
|
||||
middleware.ExampleMiddleware,
|
||||
},
|
||||
Handler: func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write([]byte("Admin users page"))
|
||||
},
|
||||
})
|
||||
func AdminIndex(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write([]byte("Admin index"))
|
||||
}
|
||||
|
||||
func AdminUsers(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write([]byte("Admin users page"))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,27 +6,12 @@ import (
|
|||
"net/http"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/constants"
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/middleware"
|
||||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
"git.kirsle.net/apps/gophertype/pkg/settings"
|
||||
"github.com/albrow/forms"
|
||||
"github.com/gorilla/mux"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/admin/setup",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Middleware: []mux.MiddlewareFunc{
|
||||
middleware.ExampleMiddleware,
|
||||
},
|
||||
Handler: InitialSetup,
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
// InitialSetup at "/admin/setup"
|
||||
func InitialSetup(w http.ResponseWriter, r *http.Request) {
|
||||
// Template variables.
|
||||
|
|
|
|||
|
|
@ -9,76 +9,14 @@ import (
|
|||
"strings"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/authentication"
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/markdown"
|
||||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
"git.kirsle.net/apps/gophertype/pkg/session"
|
||||
"git.kirsle.net/apps/gophertype/pkg/settings"
|
||||
"github.com/albrow/forms"
|
||||
"github.com/gorilla/mux"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog",
|
||||
Methods: []string{"GET"},
|
||||
Handler: BlogIndex(models.Public, false),
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/tagged",
|
||||
Methods: []string{"GET"},
|
||||
Handler: TagIndex,
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/tagged/{tag}",
|
||||
Methods: []string{"GET"},
|
||||
Handler: BlogIndex(models.Public, true),
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/archive",
|
||||
Methods: []string{"GET"},
|
||||
Handler: BlogArchive,
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog/random",
|
||||
Methods: []string{"GET"},
|
||||
Handler: BlogRandom,
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog/drafts",
|
||||
Middleware: []mux.MiddlewareFunc{
|
||||
authentication.LoginRequired,
|
||||
},
|
||||
Methods: []string{"GET"},
|
||||
Handler: BlogIndex(models.Draft, false),
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog/private",
|
||||
Middleware: []mux.MiddlewareFunc{
|
||||
authentication.LoginRequired,
|
||||
},
|
||||
Methods: []string{"GET"},
|
||||
Handler: BlogIndex(models.Private, false),
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog/unlisted",
|
||||
Middleware: []mux.MiddlewareFunc{
|
||||
authentication.LoginRequired,
|
||||
},
|
||||
Methods: []string{"GET"},
|
||||
Handler: BlogIndex(models.Unlisted, false),
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog/edit",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Middleware: []mux.MiddlewareFunc{
|
||||
authentication.LoginRequired,
|
||||
},
|
||||
Handler: EditPost,
|
||||
})
|
||||
}
|
||||
|
||||
// BlogIndex handles all of the top-level blog index routes:
|
||||
// - /blog
|
||||
// - /tagged/{tag}
|
||||
|
|
@ -99,8 +37,7 @@ func BlogIndex(privacy string, tagged bool) http.HandlerFunc {
|
|||
|
||||
// Tagged view?
|
||||
if tagged {
|
||||
params := mux.Vars(r)
|
||||
tagName = params["tag"]
|
||||
tagName = r.PathValue("tag")
|
||||
}
|
||||
|
||||
// Page title to use.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import (
|
|||
|
||||
"git.kirsle.net/apps/gophertype/pkg/authentication"
|
||||
"git.kirsle.net/apps/gophertype/pkg/console"
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/mail"
|
||||
"git.kirsle.net/apps/gophertype/pkg/markdown"
|
||||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
|
|
@ -17,26 +16,8 @@ import (
|
|||
"git.kirsle.net/apps/gophertype/pkg/session"
|
||||
"git.kirsle.net/apps/gophertype/pkg/settings"
|
||||
"github.com/albrow/forms"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/kirsle/blog/src/log"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/ask",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Handler: QuestionHandler,
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/ask/answer",
|
||||
Methods: []string{"POST"},
|
||||
Middleware: []mux.MiddlewareFunc{
|
||||
authentication.LoginRequired,
|
||||
},
|
||||
Handler: AnswerHandler,
|
||||
})
|
||||
}
|
||||
|
||||
// QuestionHandler implements the "Ask Me Anything" at the URL "/ask"
|
||||
func QuestionHandler(w http.ResponseWriter, r *http.Request) {
|
||||
var (
|
||||
|
|
@ -45,7 +26,7 @@ func QuestionHandler(w http.ResponseWriter, r *http.Request) {
|
|||
)
|
||||
|
||||
// Load their cached name from any previous comments they may have posted.
|
||||
name, _ := ses.Values["c.name"].(string)
|
||||
name := ses.Name
|
||||
|
||||
q := models.Questions.New()
|
||||
q.Name = name
|
||||
|
|
@ -64,13 +45,13 @@ func QuestionHandler(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
// Cache their name in their session for future comments/asks.
|
||||
ses.Values["c.name"] = q.Name
|
||||
ses.Save(r, w)
|
||||
ses.Name = q.Name
|
||||
ses.Save(w)
|
||||
|
||||
// Save the question.
|
||||
err := q.Save()
|
||||
if err != nil {
|
||||
log.Error("Error saving neq eustion: %s", err)
|
||||
console.Error("Error saving neq eustion: %s", err)
|
||||
responses.Error(w, r, http.StatusInternalServerError, "Error saving question: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,31 +9,12 @@ import (
|
|||
"time"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/common"
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
"git.kirsle.net/apps/gophertype/pkg/settings"
|
||||
"github.com/gorilla/feeds"
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog.rss",
|
||||
Methods: []string{"GET"},
|
||||
Handler: RSSFeed,
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog.atom",
|
||||
Methods: []string{"GET"},
|
||||
Handler: RSSFeed,
|
||||
})
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/blog.json",
|
||||
Methods: []string{"GET"},
|
||||
Handler: RSSFeed,
|
||||
})
|
||||
}
|
||||
|
||||
// RSSFeed returns the RSS (or Atom) feed for the blog.
|
||||
func RSSFeed(w http.ResponseWriter, r *http.Request) {
|
||||
// Get the first (admin) user for the feed.
|
||||
|
|
|
|||
28
pkg/controllers/search.go
Normal file
28
pkg/controllers/search.go
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
package controllers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// BlogSearch at "/blog/search" for searching blog entries.
|
||||
func BlogSearch(w http.ResponseWriter, r *http.Request) {
|
||||
// var (
|
||||
// query = r.FormValue("q")
|
||||
// pageStr = r.FormValue("page")
|
||||
// page int
|
||||
// )
|
||||
|
||||
// if a, err := strconv.Atoi(pageStr); err == nil {
|
||||
// page = a
|
||||
// }
|
||||
|
||||
// pp, err := models.Posts.SearchPosts(query, page, 20)
|
||||
|
||||
// v := responses.NewTemplateVars(w, r)
|
||||
// v.V["post"] = post
|
||||
|
||||
// // Render the body.
|
||||
// v.V["rendered"] = post.HTML()
|
||||
|
||||
// responses.RenderTemplate(w, r, "_builtin/blog/view-post.gohtml", v)
|
||||
}
|
||||
|
|
@ -14,7 +14,6 @@ import (
|
|||
"strings"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/console"
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/responses"
|
||||
"git.kirsle.net/apps/gophertype/pkg/settings"
|
||||
"github.com/edwvee/exiffix"
|
||||
|
|
@ -30,14 +29,6 @@ var (
|
|||
ImagePath = filepath.Join("static", "photos")
|
||||
)
|
||||
|
||||
func init() {
|
||||
glue.Register(glue.Endpoint{
|
||||
Path: "/admin/upload",
|
||||
Methods: []string{"GET", "POST"},
|
||||
Handler: UploadHandler,
|
||||
})
|
||||
}
|
||||
|
||||
// UploadHandler handles quick file uploads from the front-end for logged-in users.
|
||||
func UploadHandler(w http.ResponseWriter, r *http.Request) {
|
||||
// Parameters.
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
package glue
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"sort"
|
||||
"sync"
|
||||
|
||||
"github.com/gorilla/mux"
|
||||
)
|
||||
|
||||
// Endpoint is a handler attached to a path.
|
||||
type Endpoint struct {
|
||||
Path string
|
||||
Methods []string
|
||||
Middleware []mux.MiddlewareFunc
|
||||
Handler func(w http.ResponseWriter, r *http.Request)
|
||||
}
|
||||
|
||||
var (
|
||||
registry = map[string]Endpoint{}
|
||||
registryLock sync.RWMutex
|
||||
)
|
||||
|
||||
//////////////////////////
|
||||
|
||||
// Register a controller.
|
||||
func Register(e Endpoint) {
|
||||
registryLock.Lock()
|
||||
if _, ok := registry[e.Path]; ok {
|
||||
panic(fmt.Sprintf("Route Registry: path '%s' already registered", e.Path))
|
||||
}
|
||||
registry[e.Path] = e
|
||||
registryLock.Unlock()
|
||||
}
|
||||
|
||||
// GetControllers returns all the routes and handler functions.
|
||||
func GetControllers() []Endpoint {
|
||||
registryLock.RLock()
|
||||
defer registryLock.RUnlock()
|
||||
|
||||
// Sort the endpoints by longest first.
|
||||
var keys = make([]string, len(registry))
|
||||
var i int
|
||||
for key := range registry {
|
||||
keys[i] = key
|
||||
i++
|
||||
}
|
||||
|
||||
sort.Sort(byLength(keys))
|
||||
|
||||
result := make([]Endpoint, len(registry))
|
||||
for i, key := range keys {
|
||||
result[i] = registry[key]
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
type byLength []string
|
||||
|
||||
func (s byLength) Len() int {
|
||||
return len(s)
|
||||
}
|
||||
func (s byLength) Swap(i, j int) {
|
||||
s[i], s[j] = s[j], s[i]
|
||||
}
|
||||
func (s byLength) Less(i, j int) bool {
|
||||
// Sort longest over shortest.
|
||||
return len(s[j]) < len(s[i])
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@ var ageGateSuffixes = []string{
|
|||
// AgeGate is a middleware generator that does age verification for NSFW sites.
|
||||
// Single GET requests with ?over18=1 parameter may skip the middleware check.
|
||||
func AgeGate(next http.Handler) http.Handler {
|
||||
middleware := func(w http.ResponseWriter, r *http.Request) {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
s := settings.Current
|
||||
if !s.NSFW {
|
||||
next.ServeHTTP(w, r)
|
||||
|
|
@ -65,7 +65,7 @@ func AgeGate(next http.Handler) http.Handler {
|
|||
|
||||
// Finally, check if they've confirmed their age on the age-verify handler.
|
||||
ses := session.Get(r)
|
||||
if val, _ := ses.Values["age-ok"].(bool); !val {
|
||||
if !ses.AgeOK {
|
||||
// They haven't been verified. Redirect them to the age-verify handler.
|
||||
if r.FormValue("over18") == "" && r.Header.Get("X-Over-18") == "" {
|
||||
responses.Redirect(w, r, "/age-verify?next="+path)
|
||||
|
|
@ -74,7 +74,5 @@ func AgeGate(next http.Handler) http.Handler {
|
|||
}
|
||||
|
||||
next.ServeHTTP(w, r)
|
||||
}
|
||||
|
||||
return http.HandlerFunc(middleware)
|
||||
})
|
||||
}
|
||||
|
|
|
|||
40
pkg/middleware/authentication.go
Normal file
40
pkg/middleware/authentication.go
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
package middleware
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/authentication"
|
||||
"git.kirsle.net/apps/gophertype/pkg/session"
|
||||
)
|
||||
|
||||
// LoginRequired is a middleware for authenticated endpoints.
|
||||
func LoginRequired(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
_, err := authentication.CurrentUser(r)
|
||||
if err != nil {
|
||||
// Redirect to the login page.
|
||||
w.Header().Set("Location", "/login?next="+r.URL.Path)
|
||||
w.WriteHeader(http.StatusFound)
|
||||
return
|
||||
}
|
||||
|
||||
next.ServeHTTP(w, r)
|
||||
})
|
||||
}
|
||||
|
||||
// Authentication checks the authentication and loads the user onto the request context.
|
||||
func Authentication(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
user, err := authentication.CurrentUser(r)
|
||||
if err != nil {
|
||||
// User not logged in, go to next middleware.
|
||||
next.ServeHTTP(w, r)
|
||||
return
|
||||
}
|
||||
|
||||
// Put the CurrentUser into the request context.
|
||||
ctx := context.WithValue(r.Context(), session.CurrentUserKey, user)
|
||||
next.ServeHTTP(w, r.WithContext(ctx))
|
||||
})
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ import (
|
|||
// All "POST" requests are required to have an "_csrf" variable passed in which
|
||||
// matches the "csrf_token" HTTP cookie with their request.
|
||||
func CSRF(next http.Handler) http.Handler {
|
||||
middleware := func(w http.ResponseWriter, r *http.Request) {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
// All requests: verify they have a CSRF cookie, create one if not.
|
||||
var token string
|
||||
cookie, err := r.Cookie(constants.CSRFCookieName)
|
||||
|
|
@ -47,7 +47,5 @@ func CSRF(next http.Handler) http.Handler {
|
|||
}
|
||||
|
||||
next.ServeHTTP(w, r.WithContext(ctx))
|
||||
}
|
||||
|
||||
return http.HandlerFunc(middleware)
|
||||
})
|
||||
}
|
||||
|
|
|
|||
16
pkg/middleware/logging.go
Normal file
16
pkg/middleware/logging.go
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
package middleware
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Logging middleware.
|
||||
func Logging(handler http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
nw := time.Now()
|
||||
handler.ServeHTTP(w, r)
|
||||
fmt.Printf("%s %s %s %s\n", r.RemoteAddr, r.Method, r.URL, time.Since(nw))
|
||||
})
|
||||
}
|
||||
22
pkg/middleware/recovery.go
Normal file
22
pkg/middleware/recovery.go
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
package middleware
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"runtime/debug"
|
||||
|
||||
"github.com/kirsle/blog/src/log"
|
||||
)
|
||||
|
||||
// Recovery recovery middleware.
|
||||
func Recovery(handler http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
defer func() {
|
||||
if err := recover(); err != nil {
|
||||
log.Error("PANIC: %v", err)
|
||||
debug.PrintStack()
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
}
|
||||
}()
|
||||
handler.ServeHTTP(w, r)
|
||||
})
|
||||
}
|
||||
20
pkg/middleware/session.go
Normal file
20
pkg/middleware/session.go
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
package middleware
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/session"
|
||||
)
|
||||
|
||||
// Session middleware.
|
||||
func Session(handler http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
// Check for the session_id cookie.
|
||||
sess := session.LoadOrNew(r)
|
||||
ctx := context.WithValue(r.Context(), session.ContextKey, sess)
|
||||
|
||||
handler.ServeHTTP(w, r.WithContext(ctx))
|
||||
})
|
||||
}
|
||||
|
|
@ -11,7 +11,6 @@ import (
|
|||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
"git.kirsle.net/apps/gophertype/pkg/session"
|
||||
"git.kirsle.net/apps/gophertype/pkg/settings"
|
||||
"github.com/gorilla/sessions"
|
||||
)
|
||||
|
||||
// NewTemplateVars creates the TemplateVars for your current request.
|
||||
|
|
@ -42,7 +41,8 @@ func NewTemplateVars(w io.Writer, r *http.Request) TemplateValues {
|
|||
|
||||
if rw, ok := w.(http.ResponseWriter); ok {
|
||||
v.ResponseWriter = rw
|
||||
v.Flashes = session.GetFlashes(rw, r)
|
||||
flashes, errors := ses.ReadFlashes(rw)
|
||||
v.Flashes = append(flashes, errors...)
|
||||
}
|
||||
|
||||
return v
|
||||
|
|
@ -67,7 +67,7 @@ type TemplateValues struct {
|
|||
TemplatePath string // file path of html template, like "_builtin/error.gohtml"
|
||||
|
||||
// Session variables
|
||||
Session *sessions.Session
|
||||
Session *session.Session
|
||||
LoggedIn bool
|
||||
IsAdmin bool
|
||||
CurrentUser models.User
|
||||
|
|
|
|||
|
|
@ -3,56 +3,58 @@ package gophertype
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/authentication"
|
||||
"git.kirsle.net/apps/gophertype/pkg/console"
|
||||
"git.kirsle.net/apps/gophertype/pkg/controllers"
|
||||
"git.kirsle.net/apps/gophertype/pkg/glue"
|
||||
"git.kirsle.net/apps/gophertype/pkg/middleware"
|
||||
"git.kirsle.net/apps/gophertype/pkg/session"
|
||||
"github.com/gorilla/mux"
|
||||
"git.kirsle.net/apps/gophertype/pkg/models"
|
||||
)
|
||||
|
||||
// SetupRouter sets up the HTTP router.
|
||||
func (s *Site) SetupRouter() error {
|
||||
router := mux.NewRouter()
|
||||
router := http.NewServeMux()
|
||||
|
||||
router.Use(session.Middleware)
|
||||
router.Use(authentication.Middleware)
|
||||
router.Use(middleware.CSRF)
|
||||
router.Use(middleware.AgeGate)
|
||||
router.HandleFunc("/", controllers.CatchAllHandler)
|
||||
router.HandleFunc("/age-verify", controllers.AgeVerify)
|
||||
router.HandleFunc("/login", controllers.Login)
|
||||
router.HandleFunc("GET /logout", controllers.Logout)
|
||||
router.HandleFunc("/comments", controllers.PostComment)
|
||||
router.HandleFunc("/comments/subscription", controllers.ManageSubscription)
|
||||
router.HandleFunc("/comments/quick-delete", controllers.CommentQuickDelete)
|
||||
router.HandleFunc("/contact", controllers.ContactHandler)
|
||||
router.HandleFunc("GET /blog", controllers.BlogIndex(models.Public, false))
|
||||
router.HandleFunc("GET /tagged", controllers.TagIndex)
|
||||
router.HandleFunc("GET /tagged/{tag}", controllers.BlogIndex(models.Public, true))
|
||||
router.HandleFunc("GET /archive", controllers.BlogArchive)
|
||||
router.HandleFunc("GET /blog/random", controllers.BlogRandom)
|
||||
router.HandleFunc("/ask", controllers.QuestionHandler)
|
||||
router.HandleFunc("GET /blog.rss", controllers.RSSFeed)
|
||||
router.HandleFunc("GET /blog.atom", controllers.RSSFeed)
|
||||
router.HandleFunc("GET /blog.json", controllers.RSSFeed)
|
||||
router.HandleFunc("GET /blog/search", controllers.BlogSearch)
|
||||
|
||||
console.Debug("Setting up HTTP Router")
|
||||
for _, route := range glue.GetControllers() {
|
||||
console.Debug("Register: %+v", route)
|
||||
if len(route.Methods) == 0 {
|
||||
route.Methods = []string{"GET"}
|
||||
}
|
||||
// Initial setup page
|
||||
router.Handle("/admin/setup", middleware.ExampleMiddleware(http.HandlerFunc(controllers.InitialSetup)))
|
||||
|
||||
route.Methods = append(route.Methods, "HEAD")
|
||||
// Login Required
|
||||
router.HandleFunc("/admin", controllers.AdminIndex)
|
||||
router.HandleFunc("/admin/users", controllers.AdminIndex)
|
||||
router.Handle("GET /blog/drafts", middleware.LoginRequired(controllers.BlogIndex(models.Draft, false)))
|
||||
router.Handle("GET /blog/private", middleware.LoginRequired(controllers.BlogIndex(models.Private, false)))
|
||||
router.Handle("GET /blog/unlisted", middleware.LoginRequired(controllers.BlogIndex(models.Unlisted, false)))
|
||||
router.Handle("/blog/edit", middleware.LoginRequired(http.HandlerFunc(controllers.EditPost)))
|
||||
router.Handle("/ask/answer", middleware.LoginRequired(http.HandlerFunc(controllers.AnswerHandler)))
|
||||
router.Handle("/admin/upload", middleware.LoginRequired(http.HandlerFunc(controllers.UploadHandler)))
|
||||
|
||||
if len(route.Middleware) > 0 {
|
||||
console.Debug("%+v has middlewares!", route)
|
||||
// Global middlewares.
|
||||
var (
|
||||
withCSRF = middleware.CSRF(router)
|
||||
withSession = middleware.Session(withCSRF)
|
||||
withAuthentication = middleware.Authentication(withSession)
|
||||
withAgeGate = middleware.AgeGate(withAuthentication)
|
||||
withRecovery = middleware.Recovery(withAgeGate)
|
||||
withLogger = middleware.Logging(withRecovery)
|
||||
)
|
||||
|
||||
handler := route.Middleware[0](http.HandlerFunc(route.Handler))
|
||||
router.Handle(route.Path, handler).Methods(route.Methods...)
|
||||
} else {
|
||||
router.HandleFunc(route.Path, route.Handler).Methods(route.Methods...)
|
||||
}
|
||||
}
|
||||
|
||||
router.PathPrefix("/").HandlerFunc(controllers.CatchAllHandler)
|
||||
router.NotFoundHandler = http.HandlerFunc(controllers.CatchAllHandler)
|
||||
|
||||
console.Debug("Walk the mux.Router:")
|
||||
router.Walk(func(route *mux.Route, router *mux.Router, ancestors []*mux.Route) error {
|
||||
tpl, err1 := route.GetPathTemplate()
|
||||
met, err2 := route.GetMethods()
|
||||
console.Debug("path:%s methods:%s path-err:%s met-err:%s", tpl, met, err1, err2)
|
||||
return nil
|
||||
})
|
||||
|
||||
s.mux = router
|
||||
s.n.UseHandler(router)
|
||||
s.mux = withLogger
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
package session
|
||||
|
||||
// Key is a session context key.
|
||||
type Key int
|
||||
|
||||
// Session key definitions.
|
||||
const (
|
||||
SessionKey Key = iota // The request's cookie session object.
|
||||
UserKey // The request's user data for logged-in user.
|
||||
StartTimeKey // The start time of the request.
|
||||
CSRFKey // CSRF token
|
||||
)
|
||||
|
|
@ -1,88 +1,156 @@
|
|||
package session
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/cache"
|
||||
"git.kirsle.net/apps/gophertype/pkg/console"
|
||||
"github.com/gorilla/sessions"
|
||||
"git.kirsle.net/apps/gophertype/pkg/constants"
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
// Store holds your cookie store information.
|
||||
var Store sessions.Store
|
||||
|
||||
// SetSecretKey initializes a session cookie store with the secret key.
|
||||
func SetSecretKey(keyPairs ...[]byte) {
|
||||
Store = sessions.NewCookieStore(keyPairs...)
|
||||
// Session cookie object that is kept server side in Redis.
|
||||
type Session struct {
|
||||
UUID string `json:"-"` // not stored
|
||||
LoggedIn bool `json:"loggedIn"`
|
||||
UserID int `json:"userId,omitempty"`
|
||||
Flashes []string `json:"flashes,omitempty"`
|
||||
Errors []string `json:"errors,omitempty"`
|
||||
AgeOK bool `json:"ageOK,omitempty"`
|
||||
EditToken string `json:"editToken,omitempty"`
|
||||
Email string `json:"email,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
LastSeen time.Time `json:"lastSeen"`
|
||||
}
|
||||
|
||||
// Middleware gets the Gorilla session store and makes it available on the
|
||||
// Request context.
|
||||
//
|
||||
// Middleware is the first custom middleware applied, so it takes the current
|
||||
// datetime to make available later in the request and stores it on the request
|
||||
// context.
|
||||
func Middleware(next http.Handler) http.Handler {
|
||||
middleware := func(w http.ResponseWriter, r *http.Request) {
|
||||
// Set the HTML content-type header by default until overridden by a handler.
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
const (
|
||||
ContextKey = "session"
|
||||
CurrentUserKey = "current_user"
|
||||
CSRFKey = "csrf"
|
||||
RequestTimeKey = "req_time"
|
||||
)
|
||||
|
||||
// Store the current datetime on the request context.
|
||||
ctx := context.WithValue(r.Context(), StartTimeKey, time.Now())
|
||||
// New creates a blank session object.
|
||||
func New() *Session {
|
||||
return &Session{
|
||||
UUID: uuid.New().String(),
|
||||
Flashes: []string{},
|
||||
Errors: []string{},
|
||||
}
|
||||
}
|
||||
|
||||
// Get the Gorilla session and make it available in the request context.
|
||||
session, _ := Store.Get(r, "session")
|
||||
ctx = context.WithValue(ctx, SessionKey, session)
|
||||
// Load the session from the browser session_id token and Redis or creates a new session.
|
||||
func LoadOrNew(r *http.Request) *Session {
|
||||
var sess = New()
|
||||
|
||||
next.ServeHTTP(w, r.WithContext(ctx))
|
||||
// Read the session cookie value.
|
||||
cookie, err := r.Cookie(constants.SessionCookieName)
|
||||
if err != nil {
|
||||
console.Debug("session.LoadOrNew: cookie error, new sess: %s", err)
|
||||
return sess
|
||||
}
|
||||
|
||||
return http.HandlerFunc(middleware)
|
||||
// Look up this UUID in Redis.
|
||||
sess.UUID = cookie.Value
|
||||
key := fmt.Sprintf(constants.SessionRedisKeyFormat, sess.UUID)
|
||||
|
||||
err = cache.GetJSON(key, sess)
|
||||
// console.Error("LoadOrNew: raw from Redis: %+v", sess)
|
||||
if err != nil {
|
||||
console.Error("session.LoadOrNew: didn't find %s in Redis: %s", key, err)
|
||||
}
|
||||
|
||||
return sess
|
||||
}
|
||||
|
||||
// Get returns the current request's session.
|
||||
func Get(r *http.Request) *sessions.Session {
|
||||
// Save the session and send a cookie header.
|
||||
func (s *Session) Save(w http.ResponseWriter) {
|
||||
// Roll a UUID session_id value.
|
||||
if s.UUID == "" {
|
||||
s.UUID = uuid.New().String()
|
||||
}
|
||||
|
||||
// Ensure it is a valid UUID.
|
||||
if _, err := uuid.Parse(s.UUID); err != nil {
|
||||
console.Error("Session.Save: got an invalid UUID session_id: %s", err)
|
||||
s.UUID = uuid.New().String()
|
||||
}
|
||||
|
||||
// Ping last seen.
|
||||
s.LastSeen = time.Now()
|
||||
|
||||
// Save their session object in Redis.
|
||||
key := fmt.Sprintf(constants.SessionRedisKeyFormat, s.UUID)
|
||||
if err := cache.SetJSON(key, s, constants.SessionCookieMaxAge*time.Second); err != nil {
|
||||
console.Error("Session.Save: couldn't write to Redis: %s", err)
|
||||
}
|
||||
|
||||
cookie := &http.Cookie{
|
||||
Name: constants.SessionCookieName,
|
||||
Value: s.UUID,
|
||||
MaxAge: constants.SessionCookieMaxAge,
|
||||
Path: "/",
|
||||
HttpOnly: true,
|
||||
}
|
||||
http.SetCookie(w, cookie)
|
||||
}
|
||||
|
||||
// Get the session from the current HTTP request context.
|
||||
func Get(r *http.Request) *Session {
|
||||
if r == nil {
|
||||
panic("Session(*http.Request) with a nil argument!?")
|
||||
panic("session.Get: http.Request is required")
|
||||
}
|
||||
|
||||
// Cached in the request context?
|
||||
ctx := r.Context()
|
||||
if session, ok := ctx.Value(SessionKey).(*sessions.Session); ok {
|
||||
return session
|
||||
if sess, ok := ctx.Value(ContextKey).(*Session); ok {
|
||||
return sess
|
||||
}
|
||||
|
||||
// If the session wasn't on the request, it means I broke something.
|
||||
console.Warn(
|
||||
"Session(): didn't find session in request context! Getting it " +
|
||||
"from the session store instead.",
|
||||
)
|
||||
session, _ := Store.Get(r, "session")
|
||||
return session
|
||||
return LoadOrNew(r)
|
||||
}
|
||||
|
||||
// Flash adds a flashed message to the session for the next template rendering.
|
||||
// ReadFlashes returns and clears the Flashes and Errors for this session.
|
||||
func (s *Session) ReadFlashes(w http.ResponseWriter) (flashes, errors []string) {
|
||||
flashes = s.Flashes
|
||||
errors = s.Errors
|
||||
s.Flashes = []string{}
|
||||
s.Errors = []string{}
|
||||
if len(flashes)+len(errors) > 0 {
|
||||
s.Save(w)
|
||||
}
|
||||
return flashes, errors
|
||||
}
|
||||
|
||||
// Flash adds a transient message to the user's session to show on next page load.
|
||||
func Flash(w http.ResponseWriter, r *http.Request, msg string, args ...interface{}) {
|
||||
sess := Get(r)
|
||||
|
||||
var flashes []string
|
||||
if v, ok := sess.Values["flashes"].([]string); ok {
|
||||
flashes = v
|
||||
}
|
||||
|
||||
flashes = append(flashes, fmt.Sprintf(msg, args...))
|
||||
sess.Values["flashes"] = flashes
|
||||
sess.Save(r, w)
|
||||
sess.Flashes = append(sess.Flashes, fmt.Sprintf(msg, args...))
|
||||
sess.Save(w)
|
||||
}
|
||||
|
||||
// GetFlashes returns all the flashes from the session and clears the queue.
|
||||
func GetFlashes(w http.ResponseWriter, r *http.Request) []string {
|
||||
// FlashError adds a transient error message to the session.
|
||||
func FlashError(w http.ResponseWriter, r *http.Request, msg string, args ...interface{}) {
|
||||
sess := Get(r)
|
||||
if flashes, ok := sess.Values["flashes"].([]string); ok {
|
||||
sess.Values["flashes"] = []string{}
|
||||
sess.Save(r, w)
|
||||
return flashes
|
||||
}
|
||||
return []string{}
|
||||
sess.Errors = append(sess.Errors, fmt.Sprintf(msg, args...))
|
||||
sess.Save(w)
|
||||
}
|
||||
|
||||
// LoginUser marks a session as logged in to an account.
|
||||
func LoginUser(w http.ResponseWriter, r *http.Request, userID int) error {
|
||||
sess := Get(r)
|
||||
sess.LoggedIn = true
|
||||
sess.UserID = userID
|
||||
sess.Save(w)
|
||||
return nil
|
||||
}
|
||||
|
||||
// LogoutUser signs a user out.
|
||||
func LogoutUser(w http.ResponseWriter, r *http.Request) {
|
||||
sess := Get(r)
|
||||
sess.LoggedIn = false
|
||||
sess.UserID = 0
|
||||
sess.Save(w)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import (
|
|||
"path/filepath"
|
||||
|
||||
"git.kirsle.net/apps/gophertype/pkg/console"
|
||||
"git.kirsle.net/apps/gophertype/pkg/session"
|
||||
)
|
||||
|
||||
// Current holds the current app settings. When the app settings have never
|
||||
|
|
@ -47,9 +46,9 @@ type Spec struct {
|
|||
|
||||
// Redis settings
|
||||
RedisEnabled bool
|
||||
RedisHost string
|
||||
RedisPort int
|
||||
RedisDB int
|
||||
RedisHost string
|
||||
RedisPort int
|
||||
RedisDB int
|
||||
|
||||
// Security
|
||||
SecretKey string
|
||||
|
|
@ -98,7 +97,6 @@ func SetFilename(userRoot string) error {
|
|||
|
||||
Current = spec
|
||||
UserRoot = userRoot
|
||||
session.SetSecretKey([]byte(Current.SecretKey))
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -114,8 +112,6 @@ func Load() Spec {
|
|||
RedisPort: 6379,
|
||||
}
|
||||
|
||||
session.SetSecretKey([]byte(s.SecretKey))
|
||||
|
||||
return s
|
||||
}
|
||||
|
||||
|
|
@ -137,7 +133,6 @@ func (s Spec) ToJSON(w io.Writer) error {
|
|||
// Save the settings to DB.
|
||||
func (s Spec) Save() error {
|
||||
Current = s
|
||||
session.SetSecretKey([]byte(s.SecretKey))
|
||||
|
||||
fh, err := os.Create(configPath)
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user