From 30bcea40b8e54471ad2de09f64db73ce27ad477a Mon Sep 17 00:00:00 2001 From: MrMelon54 Date: Sun, 29 Oct 2023 12:55:19 +0000 Subject: [PATCH] New mjwt library path and rewrite to allow changing active variable and properly deleting routes --- .gitignore | 1 + .idea/.gitignore | 8 ---- .idea/codeStyles/codeStyleConfig.xml | 5 -- .idea/dataSources.xml | 12 ----- .idea/discord.xml | 7 --- .idea/misc.xml | 6 --- .idea/modules.xml | 8 ---- .idea/sqldialects.xml | 6 --- .idea/vcs.xml | 6 --- .idea/violet.iml | 9 ---- cmd/violet/serve.go | 2 +- cmd/violet/setup.go | 11 +++-- go.mod | 32 +++++++------ go.sum | 69 +++++++++++++++++----------- router/manager.go | 19 ++++---- router/manager_test.go | 44 +++++++++--------- servers/api/api.go | 4 +- servers/api/auth.go | 4 +- servers/api/target-types.go | 4 +- servers/api/target.go | 8 ++-- servers/conf/conf.go | 2 +- utils/fake/mjwt.go | 6 +-- 22 files changed, 116 insertions(+), 157 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/dataSources.xml delete mode 100644 .idea/discord.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/sqldialects.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/violet.iml diff --git a/.gitignore b/.gitignore index bf215e8..235059c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.sqlite *.local +.idea/ .data diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a1..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index d3d2ae2..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - sqlite.xerial - true - org.sqlite.JDBC - jdbc:sqlite:identifier.sqlite - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/discord.xml b/.idea/discord.xml deleted file mode 100644 index d8e9561..0000000 --- a/.idea/discord.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 3ce3588..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index e95f680..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml deleted file mode 100644 index c0e01ca..0000000 --- a/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/violet.iml b/.idea/violet.iml deleted file mode 100644 index 5e764c4..0000000 --- a/.idea/violet.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/cmd/violet/serve.go b/cmd/violet/serve.go index a97a78f..a7c27db 100644 --- a/cmd/violet/serve.go +++ b/cmd/violet/serve.go @@ -5,6 +5,7 @@ import ( "database/sql" "encoding/json" "flag" + "github.com/1f349/mjwt" "github.com/1f349/violet/certs" "github.com/1f349/violet/domains" errorPages "github.com/1f349/violet/error-pages" @@ -17,7 +18,6 @@ import ( "github.com/1f349/violet/servers/conf" "github.com/1f349/violet/utils" "github.com/MrMelon54/exit-reload" - "github.com/MrMelon54/mjwt" "github.com/google/subcommands" "io/fs" "log" diff --git a/cmd/violet/setup.go b/cmd/violet/setup.go index 02a8a41..3789e5a 100644 --- a/cmd/violet/setup.go +++ b/cmd/violet/setup.go @@ -182,10 +182,13 @@ func (s *setupCmd) Execute(_ context.Context, _ *flag.FlagSet, _ ...interface{}) // add with the route manager, no need to compile as this will run when opened // with the serve subcommand routeManager := router.NewManager(db, proxy.NewHybridTransportWithCalls(&nilTransport{}, &nilTransport{}, &websocket.Server{})) - err = routeManager.InsertRoute(target.Route{ - Src: path.Join(apiUrl.Host, apiUrl.Path), - Dst: answers.ApiListen, - Flags: target.FlagPre | target.FlagCors | target.FlagForwardHost | target.FlagForwardAddr, + err = routeManager.InsertRoute(target.RouteWithActive{ + Route: target.Route{ + Src: path.Join(apiUrl.Host, apiUrl.Path), + Dst: answers.ApiListen, + Flags: target.FlagPre | target.FlagCors | target.FlagForwardHost | target.FlagForwardAddr, + }, + Active: true, }) if err != nil { fmt.Println("[Violet] Failed to insert api route into database: ", err) diff --git a/go.mod b/go.mod index 98eb6ae..793a013 100644 --- a/go.mod +++ b/go.mod @@ -3,23 +3,23 @@ module github.com/1f349/violet go 1.20 require ( + github.com/1f349/mjwt v0.2.0 github.com/AlecAivazis/survey/v2 v2.3.7 github.com/MrMelon54/certgen v0.0.1 github.com/MrMelon54/exit-reload v0.0.1 - github.com/MrMelon54/mjwt v0.1.3 github.com/MrMelon54/png2ico v1.0.1 - github.com/MrMelon54/rescheduler v0.0.1 + github.com/MrMelon54/rescheduler v0.0.2 github.com/MrMelon54/trie v0.0.2 github.com/google/subcommands v1.2.0 - github.com/google/uuid v1.3.1 + github.com/google/uuid v1.4.0 github.com/gorilla/websocket v1.5.0 github.com/julienschmidt/httprouter v1.3.0 - github.com/mattn/go-sqlite3 v1.14.16 - github.com/rs/cors v1.9.0 + github.com/mattn/go-sqlite3 v1.14.17 + github.com/rs/cors v1.10.1 github.com/sethvargo/go-limiter v0.7.2 github.com/stretchr/testify v1.8.4 - golang.org/x/net v0.9.0 - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 + golang.org/x/net v0.17.0 + golang.org/x/sync v0.4.0 ) require ( @@ -27,15 +27,17 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect - github.com/kr/pretty v0.1.0 // indirect - github.com/mattn/go-colorable v0.1.2 // indirect - github.com/mattn/go-isatty v0.0.8 // indirect - github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/term v0.7.0 // indirect - golang.org/x/text v0.9.0 // indirect - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 4bfb056..2fd3af9 100644 --- a/go.sum +++ b/go.sum @@ -1,23 +1,22 @@ +github.com/1f349/mjwt v0.2.0 h1:1c3+J05RRBsClGxA91SzT3I2DkwasGA4OgLcIeXWmq4= +github.com/1f349/mjwt v0.2.0/go.mod h1:KEs6jd9JjWrQW+8feP2pGAU7pdA3aYTqjkT/YQr73PU= github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/MrMelon54/certgen v0.0.1 h1:ycWdZ2RlxQ5qSuejeBVv4aXjGo5hdqqL4j4EjrXnFMk= github.com/MrMelon54/certgen v0.0.1/go.mod h1:GHflVlSbtFLJZLpN1oWyUvDBRrR8qCWiwZLXCCnS2Gc= github.com/MrMelon54/exit-reload v0.0.1 h1:sxHa59tNEQMcikwuX2+93lw6Vi1+R7oCRF8a0C3alXc= github.com/MrMelon54/exit-reload v0.0.1/go.mod h1:PLiSfmUzwdpTTQP3BBfUPhkqPwaIZjx0DuXBnM76Bug= -github.com/MrMelon54/mjwt v0.1.1 h1:m+aTpxbhQCrOPKHN170DQMFR5r938LkviU38unob5Jw= -github.com/MrMelon54/mjwt v0.1.1/go.mod h1:oYrDBWK09Hju98xb+bRQ0wy+RuAzacxYvKYOZchR2Tk= -github.com/MrMelon54/mjwt v0.1.3 h1:FgwPPxxVgE/+BHIVB9ll1SOdu8nWpjBnAwLdAzzZ5HU= -github.com/MrMelon54/mjwt v0.1.3/go.mod h1:JD+ZkffNcuIS05p1oV+nYjgDZ0wLpiWMuTmPBqkVZck= github.com/MrMelon54/png2ico v1.0.1 h1:zJoSSl4OkvSIMWGyGPvb8fWNa0KrUvMIjgNGLNLJhVQ= github.com/MrMelon54/png2ico v1.0.1/go.mod h1:NOv3tO4497mInG+3tcFkIohmxCywUwMLU8WNxJZLVmU= -github.com/MrMelon54/rescheduler v0.0.1 h1:gzNvL8X81M00uYN0i9clFVrXCkG1UuLNYxDcvjKyBqo= -github.com/MrMelon54/rescheduler v0.0.1/go.mod h1:OQDFtZHdS4/qA/r7rtJUQA22/hbpnZ9MGQCXOPjhC6w= +github.com/MrMelon54/rescheduler v0.0.2 h1:efrRwr0BYlkaXFucZDjQqRyIawZiMEAnzjea46Bs9Oc= +github.com/MrMelon54/rescheduler v0.0.2/go.mod h1:OQDFtZHdS4/qA/r7rtJUQA22/hbpnZ9MGQCXOPjhC6w= github.com/MrMelon54/trie v0.0.2 h1:ZXWcX5ij62O9K4I/anuHmVg8L3tF0UGdlPceAASwKEY= github.com/MrMelon54/trie v0.0.2/go.mod h1:sGCGOcqb+DxSxvHgSOpbpkmA7mFZR47YDExy9OCbVZI= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s= github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= github.com/becheran/wildmatch-go v1.0.0 h1:mE3dGGkTmpKtT4Z+88t8RStG40yN9T+kFEGj2PZFSzA= github.com/becheran/wildmatch-go v1.0.0/go.mod h1:gbMvj0NtVdJ15Mg/mH9uxk2R1QCistMyU7d9KFzroX4= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI= github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -27,8 +26,8 @@ github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOW github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= +github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog= @@ -37,25 +36,36 @@ github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4d github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.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/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= +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.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= -github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +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/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= -github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +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/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/sethvargo/go-limiter v0.7.2 h1:FgC4N7RMpV5gMrUdda15FaFTkQ/L4fEqM7seXMs4oO8= github.com/sethvargo/go-limiter v0.7.2/go.mod h1:C0kbSFbiriE5k2FFOe18M1YZbAR2Fiwf72uGu0CXCcU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -69,29 +79,32 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= 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.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.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.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= 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.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= 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.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= @@ -99,6 +112,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/router/manager.go b/router/manager.go index 9553dc9..77b2c11 100644 --- a/router/manager.go +++ b/router/manager.go @@ -3,6 +3,7 @@ package router import ( "database/sql" _ "embed" + "fmt" "github.com/1f349/violet/proxy" "github.com/1f349/violet/target" "github.com/MrMelon54/rescheduler" @@ -155,7 +156,7 @@ func (m *Manager) GetAllRoutes(hosts []string) ([]target.RouteWithActive, error) for query.Next() { var a target.RouteWithActive - if query.Scan(&a.Src, &a.Dst, &a.Desc, &a.Flags, &a.Active) != nil { + if err := query.Scan(&a.Src, &a.Dst, &a.Desc, &a.Flags, &a.Active); err != nil { return nil, err } @@ -168,16 +169,18 @@ func (m *Manager) GetAllRoutes(hosts []string) ([]target.RouteWithActive, error) } } + fmt.Println(len(s)) + return s, nil } -func (m *Manager) InsertRoute(route target.Route) error { - _, err := m.db.Exec(`INSERT INTO routes (source, destination, description, flags) VALUES (?, ?, ?, ?) ON CONFLICT(source) DO UPDATE SET destination = excluded.destination, description = excluded.description, flags = excluded.flags, active = 1`, route.Src, route.Dst, route.Desc, route.Flags) +func (m *Manager) InsertRoute(route target.RouteWithActive) error { + _, err := m.db.Exec(`INSERT INTO routes (source, destination, description, flags, active) VALUES (?, ?, ?, ?, ?) ON CONFLICT(source) DO UPDATE SET destination = excluded.destination, description = excluded.description, flags = excluded.flags, active = excluded.active`, route.Src, route.Dst, route.Desc, route.Flags, route.Active) return err } func (m *Manager) DeleteRoute(source string) error { - _, err := m.db.Exec(`UPDATE routes SET active = 0 WHERE source = ?`, source) + _, err := m.db.Exec(`DELETE FROM routes WHERE source = ?`, source) return err } @@ -195,7 +198,7 @@ func (m *Manager) GetAllRedirects(hosts []string) ([]target.RedirectWithActive, for query.Next() { var a target.RedirectWithActive - if query.Scan(&a.Src, &a.Dst, &a.Desc, &a.Flags, &a.Code, &a.Active) != nil { + if err := query.Scan(&a.Src, &a.Dst, &a.Desc, &a.Flags, &a.Code, &a.Active); err != nil { return nil, err } @@ -211,13 +214,13 @@ func (m *Manager) GetAllRedirects(hosts []string) ([]target.RedirectWithActive, return s, nil } -func (m *Manager) InsertRedirect(redirect target.Redirect) error { - _, err := m.db.Exec(`INSERT INTO redirects (source, destination, description, flags, code) VALUES (?, ?, ?, ?, ?) ON CONFLICT(source) DO UPDATE SET destination = excluded.destination, description = excluded.description, flags = excluded.flags, code = excluded.code, active = 1`, redirect.Src, redirect.Dst, redirect.Desc, redirect.Flags, redirect.Code) +func (m *Manager) InsertRedirect(redirect target.RedirectWithActive) error { + _, err := m.db.Exec(`INSERT INTO redirects (source, destination, description, flags, code, active) VALUES (?, ?, ?, ?, ?, ?) ON CONFLICT(source) DO UPDATE SET destination = excluded.destination, description = excluded.description, flags = excluded.flags, code = excluded.code, active = excluded.active`, redirect.Src, redirect.Dst, redirect.Desc, redirect.Flags, redirect.Code, redirect.Active) return err } func (m *Manager) DeleteRedirect(source string) error { - _, err := m.db.Exec(`UPDATE redirects SET active = 0 WHERE source = ?`, source) + _, err := m.db.Exec(`DELETE FROM redirects WHERE source = ?`, source) return err } diff --git a/router/manager_test.go b/router/manager_test.go index 3ddc523..efab3b0 100644 --- a/router/manager_test.go +++ b/router/manager_test.go @@ -58,14 +58,14 @@ func TestManager_GetAllRoutes(t *testing.T) { } m := NewManager(db, nil) a := []error{ - m.InsertRoute(target.Route{Src: "example.com"}), - m.InsertRoute(target.Route{Src: "test.example.com"}), - m.InsertRoute(target.Route{Src: "example.com/hello"}), - m.InsertRoute(target.Route{Src: "test.example.com/hello"}), - m.InsertRoute(target.Route{Src: "example.org"}), - m.InsertRoute(target.Route{Src: "test.example.org"}), - m.InsertRoute(target.Route{Src: "example.org/hello"}), - m.InsertRoute(target.Route{Src: "test.example.org/hello"}), + m.InsertRoute(target.RouteWithActive{Route: target.Route{Src: "example.com"}, Active: true}), + m.InsertRoute(target.RouteWithActive{Route: target.Route{Src: "test.example.com"}, Active: true}), + m.InsertRoute(target.RouteWithActive{Route: target.Route{Src: "example.com/hello"}, Active: true}), + m.InsertRoute(target.RouteWithActive{Route: target.Route{Src: "test.example.com/hello"}, Active: true}), + m.InsertRoute(target.RouteWithActive{Route: target.Route{Src: "example.org"}, Active: true}), + m.InsertRoute(target.RouteWithActive{Route: target.Route{Src: "test.example.org"}, Active: true}), + m.InsertRoute(target.RouteWithActive{Route: target.Route{Src: "example.org/hello"}, Active: true}), + m.InsertRoute(target.RouteWithActive{Route: target.Route{Src: "test.example.org/hello"}, Active: true}), } for _, i := range a { if i != nil { @@ -91,29 +91,29 @@ func TestManager_GetAllRedirects(t *testing.T) { } m := NewManager(db, nil) a := []error{ - m.InsertRoute(target.Route{Src: "example.com"}), - m.InsertRoute(target.Route{Src: "test.example.com"}), - m.InsertRoute(target.Route{Src: "example.com/hello"}), - m.InsertRoute(target.Route{Src: "test.example.com/hello"}), - m.InsertRoute(target.Route{Src: "example.org"}), - m.InsertRoute(target.Route{Src: "test.example.org"}), - m.InsertRoute(target.Route{Src: "example.org/hello"}), - m.InsertRoute(target.Route{Src: "test.example.org/hello"}), + m.InsertRedirect(target.RedirectWithActive{Redirect: target.Redirect{Src: "example.com"}, Active: true}), + m.InsertRedirect(target.RedirectWithActive{Redirect: target.Redirect{Src: "test.example.com"}, Active: true}), + m.InsertRedirect(target.RedirectWithActive{Redirect: target.Redirect{Src: "example.com/hello"}, Active: true}), + m.InsertRedirect(target.RedirectWithActive{Redirect: target.Redirect{Src: "test.example.com/hello"}, Active: true}), + m.InsertRedirect(target.RedirectWithActive{Redirect: target.Redirect{Src: "example.org"}, Active: true}), + m.InsertRedirect(target.RedirectWithActive{Redirect: target.Redirect{Src: "test.example.org"}, Active: true}), + m.InsertRedirect(target.RedirectWithActive{Redirect: target.Redirect{Src: "example.org/hello"}, Active: true}), + m.InsertRedirect(target.RedirectWithActive{Redirect: target.Redirect{Src: "test.example.org/hello"}, Active: true}), } for _, i := range a { if i != nil { t.Fatal(i) } } - redirects, err := m.GetAllRoutes([]string{"example.com"}) + redirects, err := m.GetAllRedirects([]string{"example.com"}) if err != nil { t.Fatal(err) } - assert.Equal(t, []target.RouteWithActive{ - {Route: target.Route{Src: "example.com"}, Active: true}, - {Route: target.Route{Src: "test.example.com"}, Active: true}, - {Route: target.Route{Src: "example.com/hello"}, Active: true}, - {Route: target.Route{Src: "test.example.com/hello"}, Active: true}, + assert.Equal(t, []target.RedirectWithActive{ + {Redirect: target.Redirect{Src: "example.com"}, Active: true}, + {Redirect: target.Redirect{Src: "test.example.com"}, Active: true}, + {Redirect: target.Redirect{Src: "example.com/hello"}, Active: true}, + {Redirect: target.Redirect{Src: "test.example.com/hello"}, Active: true}, }, redirects) } diff --git a/servers/api/api.go b/servers/api/api.go index 5d8d6f5..15f322d 100644 --- a/servers/api/api.go +++ b/servers/api/api.go @@ -2,10 +2,10 @@ package api import ( "encoding/json" + "github.com/1f349/mjwt" + "github.com/1f349/mjwt/claims" "github.com/1f349/violet/servers/conf" "github.com/1f349/violet/utils" - "github.com/MrMelon54/mjwt" - "github.com/MrMelon54/mjwt/claims" "github.com/julienschmidt/httprouter" "net/http" "time" diff --git a/servers/api/auth.go b/servers/api/auth.go index 889e1eb..0c780fb 100644 --- a/servers/api/auth.go +++ b/servers/api/auth.go @@ -1,9 +1,9 @@ package api import ( + "github.com/1f349/mjwt" + "github.com/1f349/mjwt/auth" "github.com/1f349/violet/utils" - "github.com/MrMelon54/mjwt" - "github.com/MrMelon54/mjwt/auth" "github.com/julienschmidt/httprouter" "net/http" ) diff --git a/servers/api/target-types.go b/servers/api/target-types.go index 348f486..3888005 100644 --- a/servers/api/target-types.go +++ b/servers/api/target-types.go @@ -10,11 +10,11 @@ type sourceJson struct { func (s sourceJson) GetSource() string { return s.Src } -type routeSource target.Route +type routeSource target.RouteWithActive func (r routeSource) GetSource() string { return r.Src } -type redirectSource target.Redirect +type redirectSource target.RedirectWithActive func (r redirectSource) GetSource() string { return r.Src } diff --git a/servers/api/target.go b/servers/api/target.go index 2aad29f..593c5eb 100644 --- a/servers/api/target.go +++ b/servers/api/target.go @@ -2,10 +2,10 @@ package api import ( "encoding/json" + "github.com/1f349/mjwt" "github.com/1f349/violet/router" "github.com/1f349/violet/target" "github.com/1f349/violet/utils" - "github.com/MrMelon54/mjwt" "github.com/julienschmidt/httprouter" "log" "net/http" @@ -19,6 +19,7 @@ func SetupTargetApis(r *httprouter.Router, verify mjwt.Verifier, manager *router routes, err := manager.GetAllRoutes(domains) if err != nil { + log.Printf("[Violet] Failed to get routes from database: %s\n", err) apiError(rw, http.StatusInternalServerError, "Failed to get routes from database") return } @@ -26,7 +27,7 @@ func SetupTargetApis(r *httprouter.Router, verify mjwt.Verifier, manager *router _ = json.NewEncoder(rw).Encode(routes) })) r.POST("/route", parseJsonAndCheckOwnership[routeSource](verify, "route", func(rw http.ResponseWriter, req *http.Request, params httprouter.Params, b AuthClaims, t routeSource) { - err := manager.InsertRoute(target.Route(t)) + err := manager.InsertRoute(target.RouteWithActive(t)) if err != nil { log.Printf("[Violet] Failed to insert route into database: %s\n", err) apiError(rw, http.StatusInternalServerError, "Failed to insert route into database") @@ -50,6 +51,7 @@ func SetupTargetApis(r *httprouter.Router, verify mjwt.Verifier, manager *router redirects, err := manager.GetAllRedirects(domains) if err != nil { + log.Printf("[Violet] Failed to get redirects from database: %s\n", err) apiError(rw, http.StatusInternalServerError, "Failed to get redirects from database") return } @@ -57,7 +59,7 @@ func SetupTargetApis(r *httprouter.Router, verify mjwt.Verifier, manager *router _ = json.NewEncoder(rw).Encode(redirects) })) r.POST("/redirect", parseJsonAndCheckOwnership[redirectSource](verify, "redirect", func(rw http.ResponseWriter, req *http.Request, params httprouter.Params, b AuthClaims, t redirectSource) { - err := manager.InsertRedirect(target.Redirect(t)) + err := manager.InsertRedirect(target.RedirectWithActive(t)) if err != nil { log.Printf("[Violet] Failed to insert redirect into database: %s\n", err) apiError(rw, http.StatusInternalServerError, "Failed to insert redirect into database") diff --git a/servers/conf/conf.go b/servers/conf/conf.go index c8ee823..f4541ab 100644 --- a/servers/conf/conf.go +++ b/servers/conf/conf.go @@ -2,11 +2,11 @@ package conf import ( "database/sql" + "github.com/1f349/mjwt" errorPages "github.com/1f349/violet/error-pages" "github.com/1f349/violet/favicons" "github.com/1f349/violet/router" "github.com/1f349/violet/utils" - "github.com/MrMelon54/mjwt" ) // Conf stores the shared configuration for the API, HTTP and HTTPS servers. diff --git a/utils/fake/mjwt.go b/utils/fake/mjwt.go index 03a5df4..a691db0 100644 --- a/utils/fake/mjwt.go +++ b/utils/fake/mjwt.go @@ -3,9 +3,9 @@ package fake import ( "crypto/rand" "crypto/rsa" - "github.com/MrMelon54/mjwt" - "github.com/MrMelon54/mjwt/auth" - "github.com/MrMelon54/mjwt/claims" + "github.com/1f349/mjwt" + "github.com/1f349/mjwt/auth" + "github.com/1f349/mjwt/claims" "time" )