diff --git a/Cargo.lock b/Cargo.lock index 51d1135..facf8e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,30 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "async-trait" version = "0.1.77" @@ -99,6 +123,37 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" + [[package]] name = "bytes" version = "1.5.0" @@ -117,6 +172,106 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.52.3", +] + +[[package]] +name = "chrono-tz" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "deunicode" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -168,6 +323,27 @@ dependencies = [ "pin-utils", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + [[package]] name = "gimli" version = "0.28.1" @@ -179,11 +355,36 @@ name = "giveip" version = "1.0.0" dependencies = [ "axum", + "tera", "thiserror", "tokio", "vss", ] +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "globwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +dependencies = [ + "bitflags", + "ignore", + "walkdir", +] + [[package]] name = "h2" version = "0.4.2" @@ -261,6 +462,15 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +[[package]] +name = "humansize" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" +dependencies = [ + "libm", +] + [[package]] name = "hyper" version = "1.2.0" @@ -297,6 +507,45 @@ dependencies = [ "tokio", ] +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata", + "same-file", + "walkdir", + "winapi-util", +] + [[package]] name = "indexmap" version = "2.2.3" @@ -313,12 +562,39 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + [[package]] name = "libc" version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + [[package]] name = "matchit" version = "0.7.3" @@ -357,6 +633,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + [[package]] name = "num_cpus" version = "1.16.0" @@ -382,12 +667,104 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "parse-zoneinfo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +dependencies = [ + "regex", +] + [[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.4" @@ -420,6 +797,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "proc-macro2" version = "1.0.78" @@ -438,6 +821,65 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -450,6 +892,21 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "serde" version = "1.0.197" @@ -470,6 +927,28 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -479,6 +958,12 @@ dependencies = [ "libc", ] +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "slab" version = "0.4.9" @@ -488,6 +973,16 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slug" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd94acec9c8da640005f8e135a39fc0372e74535e6b368b7a04b875f784c8c4" +dependencies = [ + "deunicode", + "wasm-bindgen", +] + [[package]] name = "smallvec" version = "1.13.1" @@ -521,6 +1016,28 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "tera" +version = "1.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970dff17c11e884a4a09bc76e3a17ef71e01bb13447a11e85226e254fe6d10b8" +dependencies = [ + "chrono", + "chrono-tz", + "globwalk", + "humansize", + "lazy_static", + "percent-encoding", + "pest", + "pest_derive", + "rand", + "regex", + "serde", + "serde_json", + "slug", + "unic-segment", +] + [[package]] name = "thiserror" version = "1.0.57" @@ -630,12 +1147,80 @@ dependencies = [ "once_cell", ] +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" +dependencies = [ + "unic-ucd-segment", +] + +[[package]] +name = "unic-ucd-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + [[package]] name = "vss" version = "0.1.0" @@ -645,12 +1230,116 @@ dependencies = [ "tokio", ] +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.3", +] + [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index fab71af..78a63ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ axum = { version = "0.7", features = ["tokio", "http1", "http2"], default-featur tokio = { version = "1", features = ["rt-multi-thread", "signal", "macros", "net"] } thiserror = "1" vss = "0.1" +tera = "1" [profile.release] lto = "fat" diff --git a/fly.toml b/fly.toml index 573dfc3..ef18f02 100644 --- a/fly.toml +++ b/fly.toml @@ -9,51 +9,48 @@ kill_signal = "SIGINT" kill_timeout = "5s" [experimental] - auto_rollback = true +auto_rollback = true [env] - CLIENT_IP_HEADER = "Fly-Client-IP" +CLIENT_IP_HEADER = "Fly-Client-IP" +ROOT_DNS_NAME = "giveip.io" [build] - image = "ghcr.io/randomairborne/giveip:latest" - -[metrics] - port = 9090 - path = "/metrics" +image = "ghcr.io/randomairborne/giveip:latest" [[services]] - protocol = "tcp" - internal_port = 8080 - processes = ["app"] - - [[services.ports]] - port = 80 - handlers = ["http"] - - [[services.ports]] - port = 443 - handlers = ["tls", "http"] - - [services.concurrency] - type = "connections" - hard_limit = 25 - soft_limit = 20 - - [[services.http_checks]] - interval = 10000 - grace_period = "5s" - path = "/" - protocol = "http" - timeout = 2000 - [services.http_checks.headers] - accept = "text/html" - Fly-Client-IP = "1.1.1.1" - - [[services.http_checks]] - interval = 10000 - grace_period = "5s" - path = "/raw" - protocol = "http" - timeout = 2000 - [services.http_checks.headers] - Fly-Client-IP = "1.1.1.1" +protocol = "tcp" +internal_port = 8080 +processes = ["app"] + +[[services.ports]] +port = 80 +handlers = ["http"] + +[[services.ports]] +port = 443 +handlers = ["tls", "http"] + +[services.concurrency] +type = "connections" +hard_limit = 2500 +soft_limit = 2000 + +[[services.http_checks]] +interval = 10000 +grace_period = "5s" +path = "/" +protocol = "http" +timeout = 2000 +[services.http_checks.headers] +accept = "text/html" +Fly-Client-IP = "1.1.1.1" + +[[services.http_checks]] +interval = 10000 +grace_period = "5s" +path = "/raw" +protocol = "http" +timeout = 2000 +[services.http_checks.headers] +Fly-Client-IP = "1.1.1.1" diff --git a/src/404.html b/src/404.html new file mode 100644 index 0000000..f6e38ca --- /dev/null +++ b/src/404.html @@ -0,0 +1,13 @@ + + + + + + + 404 not found + + + +
404 not found
+ + diff --git a/src/index.hbs b/src/index.hbs new file mode 100644 index 0000000..48306f6 --- /dev/null +++ b/src/index.hbs @@ -0,0 +1,62 @@ + + + + + + + + + + + + + {% if ipv4 %} + Your public IP is {{ipv4}} + {% else %} + What's my IP? + {% endif %} + + + +
+ {% if ipv4 %} +
+ Your public IPv4 is: {{ipv4}} +
+ {% else %} + + {% endif %} {% if ipv6 %} +
+ Your public IPv6 is: {{ipv6}} +
+ {% else %} + + {% endif %} +
+ + + + + + + \ No newline at end of file diff --git a/src/index.html b/src/index.html deleted file mode 100644 index 5da1deb..0000000 --- a/src/index.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - What's my IP? - - - - - -
- - -
- - - - - - diff --git a/src/main.css b/src/main.css new file mode 100644 index 0000000..c25e8a5 --- /dev/null +++ b/src/main.css @@ -0,0 +1,13 @@ +html, +body { + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.stack { + display: inline; + font-size: max(5vh, 3vw); + font-family: Arial, Verdana, Helvetica, sans-serif; +} diff --git a/src/main.js b/src/main.js new file mode 100644 index 0000000..c4ae307 --- /dev/null +++ b/src/main.js @@ -0,0 +1,30 @@ +const root_dns_name = document.getElementById("root-dns-name").dataset.dnsName; +const v4_endpoint = `https://v4.${root_dns_name}/raw`; +const v6_endpoint = `https://v6.${root_dns_name}/raw`; +const ip4 = document.getElementById("ip4"); +const ip6 = document.getElementById("ip6"); +const ip4txt = document.getElementById("ip4txt"); +const ip6txt = document.getElementById("ip6txt"); +if (ip4txt.hidden) { + fetch(v4_endpoint) + .then((req) => req.text()) + .then((resp) => { + ip4.innerText = resp; + ip4txt.hidden = false; + document.getElementById("title").innerText = `Your IP is ${resp}`; + }) + .catch((failed) => { + console.log("Request failed:" + failed); + }); +} +if (ip6txt.hidden) { + fetch(v6_endpoint) + .then((req) => req.text()) + .then((resp) => { + ip6.innerText = resp; + ip6txt.hidden = false; + }) + .catch((failed) => { + console.log("Request failed:" + failed); + }); +} diff --git a/src/main.rs b/src/main.rs index 4ddfda9..190f889 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,23 +1,25 @@ #![warn(clippy::all, clippy::pedantic, clippy::nursery)] -use std::fmt::{Display, Formatter}; use std::{ - net::{IpAddr, SocketAddr}, + fmt::{Display, Formatter}, + net::{IpAddr, Ipv6Addr, SocketAddr, SocketAddrV6}, str::FromStr, sync::Arc, }; -use axum::extract::FromRequestParts; -use axum::http::header::{ACCESS_CONTROL_ALLOW_ORIGIN, CACHE_CONTROL}; -use axum::http::request::Parts; use axum::{ - extract::{ConnectInfo, Request}, - http::{HeaderMap, HeaderName, HeaderValue, StatusCode}, + extract::{ConnectInfo, FromRequestParts, Request, State}, + http::{ + header::{ACCESS_CONTROL_ALLOW_ORIGIN, CACHE_CONTROL, CONTENT_TYPE}, + request::Parts, + HeaderMap, HeaderName, HeaderValue, StatusCode, + }, middleware::Next, - response::{IntoResponse, Response}, + response::{Html, IntoResponse, Response}, routing::{any, get}, Router, }; +use tera::{Context, Tera}; use tokio::net::TcpListener; #[tokio::main] @@ -26,22 +28,25 @@ async fn main() { .unwrap_or_else(|_| 8080.to_string()) .parse::() .unwrap_or(8080); - let client_ip_var = std::env::var("CLIENT_IP_HEADER").ok(); - let v4_addr = SocketAddr::from(([0; 4], port)); - let v6_addr = SocketAddr::from(([0; 16], port)); - let state = AppState::new(client_ip_var); + let v6_addr = SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::UNSPECIFIED, port, 0, 0)); + + let state = AppState::new(); + let statics = Router::new() + .route("/main.css", get(css)) + .route("/main.js", get(js)) + .layer(axum::middleware::from_fn(noindex)); let app = Router::new() .route("/raw", any(raw)) .layer(axum::middleware::from_fn(noindex)) .route("/", get(home)) - .layer(axum::middleware::from_fn(nocors)) + .layer(axum::middleware::from_fn(nocors_nocache)) + .merge(statics) + .fallback(not_found) .with_state(state.clone()); - println!("Listening on http://{v4_addr} and http://{v6_addr} for ip requests"); - let tcp4 = TcpListener::bind(v4_addr).await.unwrap(); + println!("Listening on http://localhost:{port} and http://{v6_addr} for ip requests"); let tcp6 = TcpListener::bind(v6_addr).await.unwrap(); - - tokio::join!(svc(tcp4, app.clone()), svc(tcp6, app)); + svc(tcp6, app).await; } async fn svc(tcp: TcpListener, app: Router) { @@ -50,15 +55,27 @@ async fn svc(tcp: TcpListener, app: Router) { .await .unwrap(); } + #[allow(clippy::unused_async)] -async fn home(IpAddress(ip): IpAddress, headers: HeaderMap) -> Result { +async fn home( + IpAddress(ip): IpAddress, + headers: HeaderMap, + State(state): State, +) -> Result, String>, Error> { let accept = headers .get("Accept") .map_or("*/*", |x| x.to_str().unwrap_or("invalid header value")); if accept.contains("text/html") { - Ok(HtmlOrRaw::Html(include_str!("index.html"))) + let mut context = Context::new(); + context.insert("root_dns_name", state.root_dns_name.as_ref()); + if ip.is_ipv4() { + context.insert("ipv4", &ip.to_string()); + } else { + context.insert("ipv6", &ip.to_string()); + } + Ok(Ok(Html(state.tera.render("index.hbs", &context)?))) } else { - Ok(HtmlOrRaw::Raw(format!("{ip}\n"))) + Ok(Err(format!("{ip}\n"))) } } @@ -67,20 +84,47 @@ async fn raw(IpAddress(ip): IpAddress) -> Result { Ok(format!("{ip}\n")) } -static CORS_STAR: HeaderValue = HeaderValue::from_static("*"); +#[allow(clippy::unused_async)] +async fn css() -> ([(HeaderName, HeaderValue); 1], &'static str) { + static CSS_CONTENT_TYPE: HeaderValue = HeaderValue::from_static("text/css;charset=UTF-8"); + ( + [(CONTENT_TYPE, CSS_CONTENT_TYPE.clone())], + include_str!("main.css"), + ) +} + +#[allow(clippy::unused_async)] +async fn js() -> ([(HeaderName, HeaderValue); 1], &'static str) { + static JS_CONTENT_TYPE: HeaderValue = HeaderValue::from_static("text/javascript;charset=UTF-8"); + ( + [(CONTENT_TYPE, JS_CONTENT_TYPE.clone())], + include_str!("main.js"), + ) +} + +#[allow(clippy::unused_async)] +async fn not_found() -> Html<&'static str> { + Html(include_str!("404.html")) +} + +async fn nocors_nocache(request: Request, next: Next) -> Response { + static CORS_STAR: HeaderValue = HeaderValue::from_static("*"); + static CACHE_CONTROL_VALUE: HeaderValue = HeaderValue::from_static("no-store"); -async fn nocors(request: Request, next: Next) -> Response { let mut response = next.run(request).await; response .headers_mut() .insert(ACCESS_CONTROL_ALLOW_ORIGIN, CORS_STAR.clone()); response + .headers_mut() + .insert(CACHE_CONTROL, CACHE_CONTROL_VALUE.clone()); + response } -static ROBOTS_NAME: HeaderName = HeaderName::from_static("x-robots-tag"); -static ROBOTS_VALUE: HeaderValue = HeaderValue::from_static("noindex"); - async fn noindex(req: Request, next: Next) -> Response { + static ROBOTS_NAME: HeaderName = HeaderName::from_static("x-robots-tag"); + static ROBOTS_VALUE: HeaderValue = HeaderValue::from_static("noindex"); + let mut resp = next.run(req).await; resp.headers_mut() .insert(ROBOTS_NAME.clone(), ROBOTS_VALUE.clone()); @@ -90,6 +134,8 @@ async fn noindex(req: Request, next: Next) -> Response { #[derive(Clone)] pub struct AppState { header: Option>, + tera: Arc, + root_dns_name: Arc, } impl AppState { @@ -97,31 +143,26 @@ impl AppState { /// # Panics /// This function can panic when its hardcoded values are invalid /// or the passed `client_ip_name` is not a valid header name - pub fn new(client_ip_name: Option) -> Self { + pub fn new() -> Self { + let client_ip = std::env::var("CLIENT_IP_HEADER").ok(); + let root_dns_name: Arc = std::env::var("ROOT_DNS_NAME") + .expect("Requires ROOT_DNS_NAME in environment") + .into(); + let mut tera = Tera::default(); + tera.autoescape_on(vec!["hbs", "html", "htm"]); + tera.add_raw_template("index.hbs", include_str!("index.hbs")) + .unwrap(); Self { - header: client_ip_name.map(|v| Arc::new(HeaderName::try_from(v).unwrap())), + header: client_ip.map(|v| Arc::new(HeaderName::try_from(v).unwrap())), + tera: Arc::new(tera), + root_dns_name, } } } -pub enum HtmlOrRaw { - Html(&'static str), - Raw(String), -} - -static CACHE_CONTROL_VALUE: HeaderValue = HeaderValue::from_static("no-store"); - -impl IntoResponse for HtmlOrRaw { - fn into_response(self) -> Response { - match self { - Self::Html(v) => axum::response::Html(v).into_response(), - Self::Raw(v) => { - let mut resp = v.into_response(); - resp.headers_mut() - .insert(CACHE_CONTROL, CACHE_CONTROL_VALUE.clone()); - resp - } - } +impl Default for AppState { + fn default() -> Self { + Self::new() } } @@ -137,6 +178,7 @@ impl Display for IpAddress { #[axum::async_trait] impl FromRequestParts for IpAddress { type Rejection = Error; + async fn from_request_parts( parts: &mut Parts, state: &AppState, @@ -163,6 +205,8 @@ pub enum Error { NoHeader, #[error("Could not extract connection info")] ConnectInfo, + #[error("Templating error")] + Tera(#[from] tera::Error), #[error("Could not convert supplied header to string (this is a configuration issue)")] ToStr(#[from] axum::http::header::ToStrError), #[error("Could not convert supplied header to IP address (this is a configuration issue)")]