From 50184b30e5014af5a44b812cf9f7cbe787dcfaff Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Mon, 20 Mar 2023 20:12:02 -0500 Subject: [PATCH 01/14] =?UTF-8?q?=F0=9F=8E=89=20Initial=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 3 +++ main.go | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 go.mod create mode 100644 main.go diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..f1ed4ac --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module codeberg.org/danjones000/gopub + +go 1.19 diff --git a/main.go b/main.go new file mode 100644 index 0000000..7905807 --- /dev/null +++ b/main.go @@ -0,0 +1,5 @@ +package main + +func main() { + +} From 4139d835be395a2ea3928846ddbdceef114da959 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Mon, 20 Mar 2023 20:40:58 -0500 Subject: [PATCH 02/14] =?UTF-8?q?=E2=9E=95=20Add=20gofiber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 20 ++++++++++++++++++ go.sum | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.go | 16 +++++++++++++- 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 go.sum diff --git a/go.mod b/go.mod index f1ed4ac..bd4022c 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,23 @@ module codeberg.org/danjones000/gopub go 1.19 + +require github.com/gofiber/fiber/v2 v2.42.0 + +require ( + github.com/andybalholm/brotli v1.0.4 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/klauspost/compress v1.15.9 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect + github.com/philhofer/fwd v1.1.1 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect + github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d // indirect + github.com/tinylib/msgp v1.1.6 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.44.0 // indirect + github.com/valyala/tcplisten v1.0.0 // indirect + golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..b6be3d8 --- /dev/null +++ b/go.sum @@ -0,0 +1,65 @@ +github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/gofiber/fiber/v2 v2.42.0 h1:Fnp7ybWvS+sjNQsFvkhf4G8OhXswvB6Vee8hM/LyS+8= +github.com/gofiber/fiber/v2 v2.42.0/go.mod h1:3+SGNjqMh5VQH5Vz2Wdi43zTIV16ktlFd3x3R6O1Zlc= +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/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= +github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 h1:rmMl4fXJhKMNWl+K+r/fq4FbbKI+Ia2m9hYBLm2h4G4= +github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94/go.mod h1:90zrgN3D/WJsDd1iXHT96alCoN2KJo6/4x1DZC3wZs8= +github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d h1:Q+gqLBOPkFGHyCJxXMRqtUgUbTjI8/Ze8vu8GGyNFwo= +github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d/go.mod h1:Gy+0tqhJvgGlqnTF8CVGP0AaGRjwBtXs/a5PA0Y3+A4= +github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= +github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.44.0 h1:R+gLUhldIsfg1HokMuQjdQ5bh9nuXHPIfvkYUu9eR5Q= +github.com/valyala/fasthttp v1.44.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +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-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +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-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-20210423082822-04245dca01da/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-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +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-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/main.go b/main.go index 7905807..4cffe9f 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,19 @@ package main -func main() { +import ( + "log" + "github.com/gofiber/fiber/v2" +) + +func main() { + app := fiber.New() + + app.Get("/", func(c *fiber.Ctx) error { + return c.JSON(&fiber.Map{ + "Hello": "World", + }) + }) + + log.Fatal(app.Listen(":3000")) } From 996f59c8af7486b476549878acd3ea2e1a16a644 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Thu, 23 Mar 2023 13:03:16 -0500 Subject: [PATCH 03/14] =?UTF-8?q?=E2=9C=A8=20Initial=20work=20on=20parsing?= =?UTF-8?q?=20config=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.go | 39 +++++++++++++++++++++++++++++++++++++++ go.mod | 6 +++++- go.sum | 4 ++++ main.go | 6 +++--- 4 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 config/config.go diff --git a/config/config.go b/config/config.go new file mode 100644 index 0000000..850af5b --- /dev/null +++ b/config/config.go @@ -0,0 +1,39 @@ +package config + +import ( + "github.com/BurntSushi/toml" + "github.com/kirsle/configdir" + "path/filepath" +) + +type Config struct { + Domain string `toml:"domain"` + Username string `toml:"username"` + Password string `toml:"admin_password"` + Name string `toml:"name"` + Summary string `toml:"summary"` + Https bool `toml:"https"` + IconUrl string `toml:"icon_url""` + ImageUrl string `toml:"image_url"` + Secret string `toml:"secret"` + TrustedHosts []string `toml:"trusted_hosts"` + ManuallyApproveFollers bool `toml:"manually_approves_followers"` +} + +var config Config + +func init() { + configPath := configdir.LocalConfig("gopub") + if err := configdir.MakePath(configPath); err != nil { + panic(err) + } + + configFile := filepath.Join(configPath, "profile.toml") + if _, err := toml.DecodeFile(configFile, &config); err != nil { + panic(err) + } +} + +func GetConfig() Config { + return config +} diff --git a/go.mod b/go.mod index bd4022c..e35827d 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,11 @@ module codeberg.org/danjones000/gopub go 1.19 -require github.com/gofiber/fiber/v2 v2.42.0 +require ( + github.com/BurntSushi/toml v1.2.1 + github.com/gofiber/fiber/v2 v2.42.0 + github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f +) require ( github.com/andybalholm/brotli v1.0.4 // indirect diff --git a/go.sum b/go.sum index b6be3d8..92dd364 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,13 @@ +github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/gofiber/fiber/v2 v2.42.0 h1:Fnp7ybWvS+sjNQsFvkhf4G8OhXswvB6Vee8hM/LyS+8= github.com/gofiber/fiber/v2 v2.42.0/go.mod h1:3+SGNjqMh5VQH5Vz2Wdi43zTIV16ktlFd3x3R6O1Zlc= 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/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f h1:dKccXx7xA56UNqOcFIbuqFjAWPVtP688j5QMgmo6OHU= +github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f/go.mod h1:4rEELDSfUAlBSyUjPG0JnaNGjf13JySHFeRdD/3dLP0= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= diff --git a/main.go b/main.go index 4cffe9f..24d1b47 100644 --- a/main.go +++ b/main.go @@ -3,16 +3,16 @@ package main import ( "log" + "codeberg.org/danjones000/gopub/config" "github.com/gofiber/fiber/v2" ) func main() { app := fiber.New() + config := config.GetConfig() app.Get("/", func(c *fiber.Ctx) error { - return c.JSON(&fiber.Map{ - "Hello": "World", - }) + return c.JSON(&config) }) log.Fatal(app.Listen(":3000")) From 072031f86c4eef273b74942c72ff94845c3a97d1 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Thu, 23 Mar 2023 20:43:49 -0500 Subject: [PATCH 04/14] =?UTF-8?q?=E2=9C=A8=20Add=20remaining=20configs=20w?= =?UTF-8?q?ith=20defaults?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.go | 64 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/config/config.go b/config/config.go index 850af5b..26e731c 100644 --- a/config/config.go +++ b/config/config.go @@ -6,23 +6,65 @@ import ( "path/filepath" ) +type ProfileMetadata struct { + Key string `toml:"key"` + Value string `toml:"value"` +} + +type BlockedServer struct { + Hostname string `toml:"hostname"` + Reason string `toml:"reason"` +} + +type PrivacyReplace struct { + Domain string `toml:"domain"` + ReplaceBy string `toml:"replace_by"` +} + type Config struct { - Domain string `toml:"domain"` - Username string `toml:"username"` - Password string `toml:"admin_password"` - Name string `toml:"name"` - Summary string `toml:"summary"` - Https bool `toml:"https"` - IconUrl string `toml:"icon_url""` - ImageUrl string `toml:"image_url"` - Secret string `toml:"secret"` - TrustedHosts []string `toml:"trusted_hosts"` - ManuallyApproveFollers bool `toml:"manually_approves_followers"` + Domain string `toml:"domain"` + Username string `toml:"username"` + Password string `toml:"admin_password"` + Name string `toml:"name"` + Summary string `toml:"summary"` + Https bool `toml:"https"` + IconUrl string `toml:"icon_url""` + ImageUrl string `toml:"image_url"` + Metadata []ProfileMetadata `toml:"metadata"` + Secret string `toml:"secret"` + TrustedHosts []string `toml:"trusted_hosts"` + ManuallyApprove bool `toml:"manually_approves_followers"` + BlockedServers []BlockedServer `toml:"blocked_servers"` + CustomFooter string `toml:"custom_footer"` + Emoji string `toml:"emoji"` + DisabledNotificaions []string `toml:"disabled_notifications"` + CodeTheme string `toml:"code_highlighting_theme"` + AlsoKnownAs string `toml:"also_known_as"` + HideFollowers bool `toml:"hides_followers"` + HideFollowing bool `toml:"hides_following"` + InboxRetentionDays int `toml:"inbox_retention_days"` + CustomCSP string `toml:"custom_content_security_policy"` + WebfingerDomain string `toml:"webfinger_domain"` + Debug bool `toml:"debug"` + PrivacyReplace []PrivacyReplace `toml:"privacy_replace"` + KeyPath string `toml:"key_path"` + SessionTimeout int `toml:"session_timeout"` + Id string `toml:"id"` } var config Config +func newConfig() Config { + return Config{ + TrustedHosts: []string{"127.0.0.1"}, + CodeTheme: "friendly_grayscale", + InboxRetentionDays: 15, + SessionTimeout: 3600 * 24 * 3, + } +} + func init() { + config = newConfig() configPath := configdir.LocalConfig("gopub") if err := configdir.MakePath(configPath); err != nil { panic(err) From c67e970b2ff4ed06904b2ff09910eb68dee59a93 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Thu, 23 Mar 2023 21:20:44 -0500 Subject: [PATCH 05/14] =?UTF-8?q?=E2=9C=A8=20Check=20password?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.go | 7 +++++++ go.mod | 1 + go.sum | 1 + main.go | 17 +++++++++++++++-- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/config/config.go b/config/config.go index 26e731c..deeb991 100644 --- a/config/config.go +++ b/config/config.go @@ -3,6 +3,7 @@ package config import ( "github.com/BurntSushi/toml" "github.com/kirsle/configdir" + "golang.org/x/crypto/bcrypt" "path/filepath" ) @@ -79,3 +80,9 @@ func init() { func GetConfig() Config { return config } + +func CheckPassword(pass string) bool { + err := bcrypt.CompareHashAndPassword([]byte(config.Password), []byte(pass)) + + return err == nil +} diff --git a/go.mod b/go.mod index e35827d..22bb912 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/BurntSushi/toml v1.2.1 github.com/gofiber/fiber/v2 v2.42.0 github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 ) require ( diff --git a/go.sum b/go.sum index 92dd364..526a398 100644 --- a/go.sum +++ b/go.sum @@ -37,6 +37,7 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= diff --git a/main.go b/main.go index 24d1b47..b7ada71 100644 --- a/main.go +++ b/main.go @@ -7,12 +7,25 @@ import ( "github.com/gofiber/fiber/v2" ) +type passReq struct { + Pass string `json:"pass"` +} + func main() { app := fiber.New() - config := config.GetConfig() + conf := config.GetConfig() app.Get("/", func(c *fiber.Ctx) error { - return c.JSON(&config) + return c.JSON(&conf) + }) + + app.Post("/check_pass", func(c *fiber.Ctx) error { + req := new(passReq) + if err := c.BodyParser(req); err != nil { + panic(err) + } + + return c.JSON(config.CheckPassword(req.Pass)) }) log.Fatal(app.Listen(":3000")) From 6c9067913094a8a03417a36461e69059ad5419f6 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Fri, 24 Mar 2023 10:38:45 -0500 Subject: [PATCH 06/14] =?UTF-8?q?=F0=9F=9A=A7=20Start=20setting=20up=20cob?= =?UTF-8?q?ra=20commands?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/root.go | 24 ++++++++++++++++++++++++ go.mod | 7 +++++-- go.sum | 16 ++++++++++++++-- main.go | 7 ++++++- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 commands/root.go diff --git a/commands/root.go b/commands/root.go new file mode 100644 index 0000000..7c9c426 --- /dev/null +++ b/commands/root.go @@ -0,0 +1,24 @@ +package commands + +import ( + "fmt" + "os" + + "github.com/spf13/cobra" +) + +var rootCmd = &cobra.Command{ + Use: "gopub", + Short: "gopub is a single-user ActivityPub instance", + Long: "...", + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Run a sub-command") + }, +} + +func Execute() { + if err := rootCmd.Execute(); err != nil { + fmt.Fprintln(os.Stderr, err) + os.Exit(1) + } +} diff --git a/go.mod b/go.mod index 22bb912..9e6b9dd 100644 --- a/go.mod +++ b/go.mod @@ -6,12 +6,14 @@ require ( github.com/BurntSushi/toml v1.2.1 github.com/gofiber/fiber/v2 v2.42.0 github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 + github.com/spf13/cobra v1.6.1 + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e ) require ( github.com/andybalholm/brotli v1.0.4 // indirect github.com/google/uuid v1.3.0 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/klauspost/compress v1.15.9 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect @@ -20,9 +22,10 @@ require ( github.com/rivo/uniseg v0.2.0 // indirect github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d // indirect + github.com/spf13/pflag v1.0.5 // indirect github.com/tinylib/msgp v1.1.6 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.44.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect + golang.org/x/sys v0.3.0 // indirect ) diff --git a/go.sum b/go.sum index 526a398..63abd91 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,13 @@ github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/gofiber/fiber/v2 v2.42.0 h1:Fnp7ybWvS+sjNQsFvkhf4G8OhXswvB6Vee8hM/LyS+8= github.com/gofiber/fiber/v2 v2.42.0/go.mod h1:3+SGNjqMh5VQH5Vz2Wdi43zTIV16ktlFd3x3R6O1Zlc= 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/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f h1:dKccXx7xA56UNqOcFIbuqFjAWPVtP688j5QMgmo6OHU= github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f/go.mod h1:4rEELDSfUAlBSyUjPG0JnaNGjf13JySHFeRdD/3dLP0= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= @@ -21,10 +24,15 @@ github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 h1:rmMl4fXJhKMNWl+K+r/fq4FbbKI+Ia2m9hYBLm2h4G4= github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94/go.mod h1:90zrgN3D/WJsDd1iXHT96alCoN2KJo6/4x1DZC3wZs8= github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d h1:Q+gqLBOPkFGHyCJxXMRqtUgUbTjI8/Ze8vu8GGyNFwo= github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d/go.mod h1:Gy+0tqhJvgGlqnTF8CVGP0AaGRjwBtXs/a5PA0Y3+A4= +github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= +github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= @@ -37,8 +45,9 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 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= @@ -54,8 +63,9 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/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-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -68,3 +78,5 @@ golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4f 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-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index b7ada71..fed16d4 100644 --- a/main.go +++ b/main.go @@ -3,15 +3,20 @@ package main import ( "log" + "codeberg.org/danjones000/gopub/commands" "codeberg.org/danjones000/gopub/config" "github.com/gofiber/fiber/v2" ) +func main() { + commands.Execute() +} + type passReq struct { Pass string `json:"pass"` } -func main() { +func mainOld() { app := fiber.New() conf := config.GetConfig() From 213c9f65414c0c492d2e0b394337f407eed8ec85 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Fri, 24 Mar 2023 13:03:21 -0500 Subject: [PATCH 07/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Move=20web=20to=20su?= =?UTF-8?q?b-command?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + commands/app.go | 40 ++++++++++++++++++++++++++++++++++++++++ commands/root.go | 7 ++++--- main.go | 28 ---------------------------- 4 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 .gitignore create mode 100644 commands/app.go diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b454bff --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +gopub diff --git a/commands/app.go b/commands/app.go new file mode 100644 index 0000000..8e13b5e --- /dev/null +++ b/commands/app.go @@ -0,0 +1,40 @@ +package commands + +import ( + "codeberg.org/danjones000/gopub/config" + "github.com/gofiber/fiber/v2" + "github.com/spf13/cobra" + "log" +) + +type passReq struct { + Pass string `json:"pass"` +} + +func app(cmd *cobra.Command, args []string) { + app := fiber.New() + conf := config.GetConfig() + + app.Get("/", func(c *fiber.Ctx) error { + return c.JSON(&conf) + }) + + app.Post("/check_pass", func(c *fiber.Ctx) error { + req := new(passReq) + if err := c.BodyParser(req); err != nil { + panic(err) + } + + return c.JSON(config.CheckPassword(req.Pass)) + }) + + log.Fatal(app.Listen(":3000")) +} + +var AppCmd = &cobra.Command{ + Use: "app", + Short: "Run the gopub webapp", + Long: `This is the main command. This will start the application, and keep it running. +You may want to run this from something like supervisor or systemd`, + Run: app, +} diff --git a/commands/root.go b/commands/root.go index 7c9c426..316c9e7 100644 --- a/commands/root.go +++ b/commands/root.go @@ -11,9 +11,10 @@ var rootCmd = &cobra.Command{ Use: "gopub", Short: "gopub is a single-user ActivityPub instance", Long: "...", - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Run a sub-command") - }, +} + +func init() { + rootCmd.AddCommand(AppCmd) } func Execute() { diff --git a/main.go b/main.go index fed16d4..4516183 100644 --- a/main.go +++ b/main.go @@ -1,37 +1,9 @@ package main import ( - "log" - "codeberg.org/danjones000/gopub/commands" - "codeberg.org/danjones000/gopub/config" - "github.com/gofiber/fiber/v2" ) func main() { commands.Execute() } - -type passReq struct { - Pass string `json:"pass"` -} - -func mainOld() { - app := fiber.New() - conf := config.GetConfig() - - app.Get("/", func(c *fiber.Ctx) error { - return c.JSON(&conf) - }) - - app.Post("/check_pass", func(c *fiber.Ctx) error { - req := new(passReq) - if err := c.BodyParser(req); err != nil { - panic(err) - } - - return c.JSON(config.CheckPassword(req.Pass)) - }) - - log.Fatal(app.Listen(":3000")) -} From 12fd475ee3b6af400bee4de980985db2500eae38 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Sat, 25 Mar 2023 20:42:54 -0500 Subject: [PATCH 08/14] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20project=20to=20le?= =?UTF-8?q?nore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- commands/app.go | 4 ++-- commands/root.go | 4 ++-- config/config.go | 2 +- go.mod | 2 +- main.go | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b454bff..b1e2a80 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gopub +lenore diff --git a/commands/app.go b/commands/app.go index 8e13b5e..5dcc552 100644 --- a/commands/app.go +++ b/commands/app.go @@ -1,7 +1,7 @@ package commands import ( - "codeberg.org/danjones000/gopub/config" + "codeberg.org/danjones000/lenore/config" "github.com/gofiber/fiber/v2" "github.com/spf13/cobra" "log" @@ -33,7 +33,7 @@ func app(cmd *cobra.Command, args []string) { var AppCmd = &cobra.Command{ Use: "app", - Short: "Run the gopub webapp", + Short: "Run the lenore webapp", Long: `This is the main command. This will start the application, and keep it running. You may want to run this from something like supervisor or systemd`, Run: app, diff --git a/commands/root.go b/commands/root.go index 316c9e7..2bb4745 100644 --- a/commands/root.go +++ b/commands/root.go @@ -8,8 +8,8 @@ import ( ) var rootCmd = &cobra.Command{ - Use: "gopub", - Short: "gopub is a single-user ActivityPub instance", + Use: "lenore", + Short: "lenore is a single-user ActivityPub instance", Long: "...", } diff --git a/config/config.go b/config/config.go index deeb991..8d8ae43 100644 --- a/config/config.go +++ b/config/config.go @@ -66,7 +66,7 @@ func newConfig() Config { func init() { config = newConfig() - configPath := configdir.LocalConfig("gopub") + configPath := configdir.LocalConfig("lenore") if err := configdir.MakePath(configPath); err != nil { panic(err) } diff --git a/go.mod b/go.mod index 9e6b9dd..1ae9a43 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module codeberg.org/danjones000/gopub +module codeberg.org/danjones000/lenore go 1.19 diff --git a/main.go b/main.go index 4516183..dd58edd 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "codeberg.org/danjones000/gopub/commands" + "codeberg.org/danjones000/lenore/commands" ) func main() { From 60c930881b87140367c1f3ab5678addd17b08fad Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Sun, 26 Mar 2023 17:54:02 -0500 Subject: [PATCH 09/14] =?UTF-8?q?=E2=9C=A8=20Add=20a=20few=20useful=20midd?= =?UTF-8?q?lewares?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/app.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/commands/app.go b/commands/app.go index 5dcc552..5fddd11 100644 --- a/commands/app.go +++ b/commands/app.go @@ -3,6 +3,8 @@ package commands import ( "codeberg.org/danjones000/lenore/config" "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/middleware/cors" + "github.com/gofiber/fiber/v2/middleware/logger" "github.com/spf13/cobra" "log" ) @@ -15,6 +17,17 @@ func app(cmd *cobra.Command, args []string) { app := fiber.New() conf := config.GetConfig() + app.Use(func(c *fiber.Ctx) error { + c.Set("X-Clacks-Overhead", "GNU Terry Pratchett, Robin Williams") + c.Next() + return nil + }) + app.Use(logger.New(logger.Config{ + Format: "${time} | ${status} | ${latency} | ${method} | ${path} | ${body}\n", + TimeFormat: "2006-01-02T15:04:05", + })) + app.Use(cors.New(cors.Config{MaxAge: 3600})) + app.Get("/", func(c *fiber.Ctx) error { return c.JSON(&conf) }) From 2ac49565fd12948e6f4314455ea5b716a563472c Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Mon, 27 Mar 2023 14:12:47 -0500 Subject: [PATCH 10/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Move=20code=20for=20?= =?UTF-8?q?web=20app=20to=20its=20own=20folder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.go | 43 +++++++++++++++++++++++++++++++++++++++++++ commands/app.go | 37 ++++--------------------------------- 2 files changed, 47 insertions(+), 33 deletions(-) create mode 100644 app/app.go diff --git a/app/app.go b/app/app.go new file mode 100644 index 0000000..ab07226 --- /dev/null +++ b/app/app.go @@ -0,0 +1,43 @@ +package app + +import ( + "codeberg.org/danjones000/lenore/config" + "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/middleware/cors" + "github.com/gofiber/fiber/v2/middleware/logger" +) + +type passReq struct { + Pass string `json:"pass"` +} + +func New() *fiber.App { + app := fiber.New() + conf := config.GetConfig() + + app.Use(func(c *fiber.Ctx) error { + c.Set("X-Clacks-Overhead", "GNU Terry Pratchett, Robin Williams") + c.Next() + return nil + }) + app.Use(logger.New(logger.Config{ + Format: "${time} | ${status} | ${latency} | ${method} | ${path} | ${body}\n", + TimeFormat: "2006-01-02T15:04:05", + })) + app.Use(cors.New(cors.Config{MaxAge: 3600})) + + app.Get("/", func(c *fiber.Ctx) error { + return c.JSON(&conf) + }) + + app.Post("/check_pass", func(c *fiber.Ctx) error { + req := new(passReq) + if err := c.BodyParser(req); err != nil { + panic(err) + } + + return c.JSON(config.CheckPassword(req.Pass)) + }) + + return app +} diff --git a/commands/app.go b/commands/app.go index 5fddd11..226d87c 100644 --- a/commands/app.go +++ b/commands/app.go @@ -1,10 +1,7 @@ package commands import ( - "codeberg.org/danjones000/lenore/config" - "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/middleware/cors" - "github.com/gofiber/fiber/v2/middleware/logger" + web "codeberg.org/danjones000/lenore/app" "github.com/spf13/cobra" "log" ) @@ -13,34 +10,8 @@ type passReq struct { Pass string `json:"pass"` } -func app(cmd *cobra.Command, args []string) { - app := fiber.New() - conf := config.GetConfig() - - app.Use(func(c *fiber.Ctx) error { - c.Set("X-Clacks-Overhead", "GNU Terry Pratchett, Robin Williams") - c.Next() - return nil - }) - app.Use(logger.New(logger.Config{ - Format: "${time} | ${status} | ${latency} | ${method} | ${path} | ${body}\n", - TimeFormat: "2006-01-02T15:04:05", - })) - app.Use(cors.New(cors.Config{MaxAge: 3600})) - - app.Get("/", func(c *fiber.Ctx) error { - return c.JSON(&conf) - }) - - app.Post("/check_pass", func(c *fiber.Ctx) error { - req := new(passReq) - if err := c.BodyParser(req); err != nil { - panic(err) - } - - return c.JSON(config.CheckPassword(req.Pass)) - }) - +func run(cmd *cobra.Command, args []string) { + app := web.New() log.Fatal(app.Listen(":3000")) } @@ -49,5 +20,5 @@ var AppCmd = &cobra.Command{ Short: "Run the lenore webapp", Long: `This is the main command. This will start the application, and keep it running. You may want to run this from something like supervisor or systemd`, - Run: app, + Run: run, } From 673b42394ce20eae4389b30eb217a2ab1ab53b7a Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Mon, 27 Mar 2023 20:48:25 -0500 Subject: [PATCH 11/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Anonymous=20structs?= =?UTF-8?q?=20are=20cool?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.go | 8 +++----- commands/app.go | 4 ---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/app.go b/app/app.go index ab07226..4d5ac8f 100644 --- a/app/app.go +++ b/app/app.go @@ -7,10 +7,6 @@ import ( "github.com/gofiber/fiber/v2/middleware/logger" ) -type passReq struct { - Pass string `json:"pass"` -} - func New() *fiber.App { app := fiber.New() conf := config.GetConfig() @@ -31,7 +27,9 @@ func New() *fiber.App { }) app.Post("/check_pass", func(c *fiber.Ctx) error { - req := new(passReq) + req := new(struct { + Pass string `json:"pass"` + }) if err := c.BodyParser(req); err != nil { panic(err) } diff --git a/commands/app.go b/commands/app.go index 226d87c..ed932c5 100644 --- a/commands/app.go +++ b/commands/app.go @@ -6,10 +6,6 @@ import ( "log" ) -type passReq struct { - Pass string `json:"pass"` -} - func run(cmd *cobra.Command, args []string) { app := web.New() log.Fatal(app.Listen(":3000")) From 60131a4701e3018a3bd31d2ee08d00fe369a9a51 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Wed, 3 May 2023 21:06:35 -0500 Subject: [PATCH 12/14] =?UTF-8?q?=F0=9F=9A=A7=20Work=20on=20actor=20object?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/app.go | 11 +++++ config/config.go | 20 +++++++++ go.mod | 39 +++++++++++----- go.sum | 114 ++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 152 insertions(+), 32 deletions(-) diff --git a/app/app.go b/app/app.go index 4d5ac8f..4aee30b 100644 --- a/app/app.go +++ b/app/app.go @@ -2,9 +2,13 @@ package app import ( "codeberg.org/danjones000/lenore/config" + vocab "github.com/go-ap/activitypub" + "github.com/go-ap/processing" + "github.com/gofiber/adaptor/v2" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/cors" "github.com/gofiber/fiber/v2/middleware/logger" + "net/http" ) func New() *fiber.App { @@ -26,6 +30,13 @@ func New() *fiber.App { return c.JSON(&conf) }) + var meHandle processing.ItemHandlerFn + meHandle = func(r *http.Request) (vocab.Item, error) { + return conf.GetActor(), nil + } + + app.Get("/me", adaptor.HTTPHandler(meHandle)) + app.Post("/check_pass", func(c *fiber.Ctx) error { req := new(struct { Pass string `json:"pass"` diff --git a/config/config.go b/config/config.go index 8d8ae43..f860c82 100644 --- a/config/config.go +++ b/config/config.go @@ -2,6 +2,7 @@ package config import ( "github.com/BurntSushi/toml" + vocab "github.com/go-ap/activitypub" "github.com/kirsle/configdir" "golang.org/x/crypto/bcrypt" "path/filepath" @@ -53,6 +54,25 @@ type Config struct { Id string `toml:"id"` } +func (c Config) GetIcon() vocab.IRI { + // @todo return a media object, instead of an IRI + + return vocab.IRI(c.IconUrl) +} + +func (c Config) GetActor() vocab.Actor { + return vocab.Actor{ + // Id: + Name: vocab.NaturalLanguageValues{ + vocab.LangRefValue{ + Ref: "en", + Value: []byte(c.Name), + }, + }, + Icon: c.GetIcon(), + } +} + var config Config func newConfig() Config { diff --git a/go.mod b/go.mod index 1ae9a43..40bd616 100644 --- a/go.mod +++ b/go.mod @@ -4,28 +4,47 @@ go 1.19 require ( github.com/BurntSushi/toml v1.2.1 - github.com/gofiber/fiber/v2 v2.42.0 + github.com/go-ap/activitypub v0.0.0-20230323123728-77b329013634 + github.com/go-ap/processing v0.0.0-20230323123913-b2713df97a32 + github.com/gofiber/adaptor/v2 v2.2.0 + github.com/gofiber/fiber/v2 v2.43.0 github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f github.com/spf13/cobra v1.6.1 - golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e + golang.org/x/crypto v0.7.0 ) require ( - github.com/andybalholm/brotli v1.0.4 // indirect + git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect + git.sr.ht/~mariusor/lw v0.0.0-20230317075520-07e173563bf8 // indirect + github.com/andybalholm/brotli v1.0.5 // indirect + github.com/go-ap/client v0.0.0-20230323123805-a1114dc5ba4f // indirect + github.com/go-ap/errors v0.0.0-20221205040414-01c1adfc98ea // indirect + github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 // indirect + github.com/go-fed/httpsig v1.1.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/uuid v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect - github.com/klauspost/compress v1.15.9 // indirect + github.com/klauspost/compress v1.16.3 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect - github.com/philhofer/fwd v1.1.1 // indirect + github.com/openshift/osin v1.0.1 // indirect + github.com/pborman/uuid v1.2.0 // indirect + github.com/philhofer/fwd v1.1.2 // indirect github.com/rivo/uniseg v0.2.0 // indirect + github.com/rs/xid v1.4.0 // indirect + github.com/rs/zerolog v1.29.0 // indirect github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect - github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d // indirect + github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tinylib/msgp v1.1.6 // indirect + github.com/tinylib/msgp v1.1.8 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.44.0 // indirect + github.com/valyala/fasthttp v1.45.0 // indirect + github.com/valyala/fastjson v1.6.4 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.3.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/oauth2 v0.6.0 // indirect + golang.org/x/sys v0.6.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/go.sum b/go.sum index 63abd91..fba2c17 100644 --- a/go.sum +++ b/go.sum @@ -1,82 +1,152 @@ +git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= +git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= +git.sr.ht/~mariusor/lw v0.0.0-20230317075520-07e173563bf8 h1:D5suqGJOxwGY8H4tqm9Kz8txsiFqiHeaSU9ww1Djfg8= +git.sr.ht/~mariusor/lw v0.0.0-20230317075520-07e173563bf8/go.mod h1:qGYsPqQVVmTZb54m50roPeXPlabiTOpcmco8LFefWzY= github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/gofiber/fiber/v2 v2.42.0 h1:Fnp7ybWvS+sjNQsFvkhf4G8OhXswvB6Vee8hM/LyS+8= -github.com/gofiber/fiber/v2 v2.42.0/go.mod h1:3+SGNjqMh5VQH5Vz2Wdi43zTIV16ktlFd3x3R6O1Zlc= +github.com/go-ap/activitypub v0.0.0-20230323123728-77b329013634 h1:zD/tSS22PgVrJTJatsefCvug/RjabVy6JmshKYzOQok= +github.com/go-ap/activitypub v0.0.0-20230323123728-77b329013634/go.mod h1:qw0WNf+PTG69Xu6mVqUluDuKl1VwVYdgntOZQFBZQ48= +github.com/go-ap/client v0.0.0-20230323123805-a1114dc5ba4f h1:ZOQfbSNAsQOLa/c3/mRCOMSSXjOnAyCMdiJ9myJiYBk= +github.com/go-ap/client v0.0.0-20230323123805-a1114dc5ba4f/go.mod h1:ChxiPiPaRRYpsEFAX3KGAeE9P9upancoJTRSaaudpJE= +github.com/go-ap/errors v0.0.0-20221205040414-01c1adfc98ea h1:ywGtLGVjJjMrq4mu35Qmu+NtlhlTk/gTayE6Bb4tQZk= +github.com/go-ap/errors v0.0.0-20221205040414-01c1adfc98ea/go.mod h1:SaTNjEEkp0q+w3pUS1ccyEL/lUrHteORlDq/e21mCc8= +github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 h1:GMKIYXyXPGIp+hYiWOhfqK4A023HdgisDT4YGgf99mw= +github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73/go.mod h1:jyveZeGw5LaADntW+UEsMjl3IlIwk+DxlYNsbofQkGA= +github.com/go-ap/processing v0.0.0-20230323123913-b2713df97a32 h1:Nq8P2RQGItuidqjYTQXAAYUAfCkk3N+W1dAENoCs0TU= +github.com/go-ap/processing v0.0.0-20230323123913-b2713df97a32/go.mod h1:nP5lIHYvCWUphTT10qo8cC/rT1bwQHUS8RK1jtzxEBo= +github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI= +github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofiber/adaptor/v2 v2.2.0 h1:MGz/LW8l+avBER56v87dzcH+mqi+90CX00k8Lv8QQz8= +github.com/gofiber/adaptor/v2 v2.2.0/go.mod h1:A51dt83PyWNUZp/9Op4FBI2qxDUceg15hWtf8Vk9ZOU= +github.com/gofiber/fiber/v2 v2.43.0 h1:yit3E4kHf178B60p5CQBa/3v+WVuziWMa/G2ZNyLJB0= +github.com/gofiber/fiber/v2 v2.43.0/go.mod h1:mpS1ZNE5jU+u+BA4FbM+KKnUzJ4wzTK+FT2tG3tU+6I= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/uuid v1.0.0/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/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f h1:dKccXx7xA56UNqOcFIbuqFjAWPVtP688j5QMgmo6OHU= github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f/go.mod h1:4rEELDSfUAlBSyUjPG0JnaNGjf13JySHFeRdD/3dLP0= -github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= +github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= +github.com/openshift/osin v1.0.1 h1:2hYushQtTLGVfnKAmz1+/ln5GZD0ykJCavs2JIwVEfQ= +github.com/openshift/osin v1.0.1/go.mod h1:/gGuqQHvGNST0GB+Pomi3398FTdcM+9UaXafpqHvfDM= +github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= +github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= +github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 h1:rmMl4fXJhKMNWl+K+r/fq4FbbKI+Ia2m9hYBLm2h4G4= github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94/go.mod h1:90zrgN3D/WJsDd1iXHT96alCoN2KJo6/4x1DZC3wZs8= -github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d h1:Q+gqLBOPkFGHyCJxXMRqtUgUbTjI8/Ze8vu8GGyNFwo= github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d/go.mod h1:Gy+0tqhJvgGlqnTF8CVGP0AaGRjwBtXs/a5PA0Y3+A4= +github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee h1:8Iv5m6xEo1NR1AvpV+7XmhI4r39LGNzwUL4YpMuL5vk= +github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee/go.mod h1:qwtSXrKuJh/zsFQ12yEE89xfCrGKK63Rr7ctU/uCo4g= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= +github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= +github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.44.0 h1:R+gLUhldIsfg1HokMuQjdQ5bh9nuXHPIfvkYUu9eR5Q= -github.com/valyala/fasthttp v1.44.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY= +github.com/valyala/fasthttp v1.45.0 h1:zPkkzpIn8tdHZUrVa6PzYd0i5verqiPSkgTd3bSUcpA= +github.com/valyala/fasthttp v1.45.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= +github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ= +github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +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.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= +golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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-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-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-20210423082822-04245dca01da/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-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/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.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.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.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= golang.org/x/text v0.3.0/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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From fb84ebb9dbdbd16cecbb7a4b671c84e628975614 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Fri, 30 Jun 2023 14:56:52 -0500 Subject: [PATCH 13/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Constructors=20are?= =?UTF-8?q?=20handy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.go | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/config/config.go b/config/config.go index f860c82..d00c185 100644 --- a/config/config.go +++ b/config/config.go @@ -54,23 +54,24 @@ type Config struct { Id string `toml:"id"` } -func (c Config) GetIcon() vocab.IRI { - // @todo return a media object, instead of an IRI +func (c Config) GetIcon() *vocab.Object { + var link = vocab.ObjectNew(vocab.ImageType) + link.URL = vocab.IRI(c.IconUrl) + // @todo figure out actual mime type + link.MediaType = vocab.MimeType("image/jpeg") - return vocab.IRI(c.IconUrl) + return link } -func (c Config) GetActor() vocab.Actor { - return vocab.Actor{ - // Id: - Name: vocab.NaturalLanguageValues{ - vocab.LangRefValue{ - Ref: "en", - Value: []byte(c.Name), - }, - }, - Icon: c.GetIcon(), - } +func (c Config) GetActor() *vocab.Actor { + var me = vocab.PersonNew(vocab.IRI(c.Id)) + me.Name = vocab.DefaultNaturalLanguageValue(c.Name) + me.Icon = c.GetIcon() + + // @todo parse markdown into html + me.Summary = vocab.DefaultNaturalLanguageValue(c.Summary) + + return me } var config Config From 84945e0f5402a2cf036367012eb188507ca5744a Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Wed, 11 Sep 2024 20:57:23 -0500 Subject: [PATCH 14/14] =?UTF-8?q?=F0=9F=8E=89=20Restart=20project?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fresh start --- build/.gitignore | 1 + cmd/lenore/main.go | 5 +++++ go.mod | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 build/.gitignore create mode 100644 cmd/lenore/main.go create mode 100644 go.mod diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000..b1e2a80 --- /dev/null +++ b/build/.gitignore @@ -0,0 +1 @@ +lenore diff --git a/cmd/lenore/main.go b/cmd/lenore/main.go new file mode 100644 index 0000000..7905807 --- /dev/null +++ b/cmd/lenore/main.go @@ -0,0 +1,5 @@ +package main + +func main() { + +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..3947c9d --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module codeberg.org/danjones000/lenore + +go 1.23.1