http 2.0.0

.cargo/audit.toml

@@ -0,0 +1,3 @@
+# https://github.com/thecoshman/http/issues/140
+[advisories]
+ignore = ["RUSTSEC-2021-0078", "RUSTSEC-2021-0079", "RUSTSEC-2020-0071", "RUSTSEC-2021-0139", "RUSTSEC-2023-0081", "RUSTSEC-2021-0144", "RUSTSEC-2021-0145", "RUSTSEC-2020-0027", "RUSTSEC-2022-0022"]

.cargo/config.toml

@@ -0,0 +1,4 @@
+# Needed for st_dev/st_ino on windows ("windows_by_handle")
+# available since 2019 in 1.38: https://github.com/rust-lang/rust/commit/c69f367bafb3a2f90d44fe54fc20d57996fa294a
+[env]
+RUSTC_BOOTSTRAP = "1"

.gitignore

@@ -6,10 +6,15 @@
 !Cargo.toml
 !rustfmt.toml
 !build.rs
+!build-ioctl.c
 !http-manifest.rc
 !install.*
 !*.md
+!.cargo
+!.cargo/**
 !src
 !src/**
 !assets
 !assets/**
+!vendor
+!vendor/**

Cargo.toml

@@ -8,8 +8,8 @@ keywords = ["http", "server", "https", "webdav", "directory"]
 categories = ["network-programming", "web-programming::http-server"]
 license = "MIT"
 build = "build.rs"
-# Remember to also update in appveyor.yml
-version = "1.13.2"
+# Remember to also update in appveyor.yml and the http-crates.io branch
+version = "2.0.0"
 # Remember to also update in http.md
 authors = ["thecoshman <rust@thecoshman.com>",
            "nabijaczleweli <nabijaczleweli@nabijaczleweli.xyz>",
@@ -24,56 +24,52 @@ authors = ["thecoshman <rust@thecoshman.com>",
 [dependencies]
 hyper-native-tls = "0.3"
 percent-encoding = "2.1"
-lazy_static = "1.4"
-serde_json = "0.9"
+serde_json = "1.0"
 mime_guess = "1.8"
 tabwriter = "1.1"
 itertools = "0.8"
-lazysort = "0.2"
-unicase = "2.4"
+arrayvec = "0.7"
 walkdir = "2.2"
-base64 = "0.10"
 blake3 = "1.3"
 flate2 = "1.0"
-rfsapi = "0.1"
 xml-rs = "0.8"
-bzip2 = "0.4"
 ctrlc = "3.1"
-regex = "1.2"
-serde = "0.9"
+serde = "1.0"
 clap = "2.33"
+libc = "0.2"
 rand = "0.7"
 time = "0.1"
 
 [dependencies.trivial_colours]
 version = "0.3"
 default-features = false
 
+[dependencies.rfsapi]
+path = "vendor/rfsapi-0.2.0"
+
 [dependencies.cidr]
 version = "0.1"
 default-features = false
 
 [dependencies.brotli]
-version = "3.3"
-default-features = false
-features = ["std"]
+version = "6.0"
+features = ["simd"]
 
 [dependencies.iron]
-version = "0.6"
+path = "vendor/iron-0.6.1"
 features = ["hyper-native-tls"]
 
+[patch.crates-io.hyper]
+path = "vendor/hyper-0.10.16"
+
 [target.'cfg(target_os = "windows")'.dependencies.winapi]
 version = "0.3"
 features = ["fileapi"]
 
-[target.'cfg(not(target_os = "windows"))'.dependencies.os-str-generic]
-version = "0.2"
-
-[target.'cfg(not(any(target_os = "windows", target_os = "macos")))'.dependencies.libc]
-version = "0.2"
 
 [build-dependencies]
 embed-resource = "1.3"
+base64 = "0.10"
 
 [target.'cfg(not(any(target_os = "windows", target_os = "macos")))'.build-dependencies.cc]
 version = "1.0"

README.md

@@ -33,8 +33,9 @@ See [the manpage](http.md) for full list.
 If you have `cargo` installed (you're a Rust developer) all you need to do is:
 
 ```sh
-cargo install https
+cargo install --git https://github.com/thecoshman/http
 ```
+(the `https` crates.io package *was* http, but [is now unpublishable](//github.com/thecoshman/http/pull/160#issuecomment-2143877822))
 
 Which will install `http` and `httplz` (identical, disable one or another if they clash) in the folder where all other binaries go.
 
@@ -80,4 +81,4 @@ The idea is to make a program that can compile down to a simple binary that can
   * [x] If an index file isn't provided, one will be generated (in memory, no touching the disk, why would you do that you dirty freak you), that will list the current files and folders (and then sub directories will have index files generated as required)
   * [x] Changes made to files should be reflected instantly, as I don't see why anything would be cached... you request a file, a file will be looked for
 
-It's not going to be a 'production ready' tool, it's a quick and dirty way of hosting a folder, so whilst I'll try to make it secure, it is not going to be a serious goal.
+~~It's not going to be a 'production ready' tool, it's a quick and dirty way of hosting a folder, so whilst I'll try to make it secure, it is not going to be a serious goal.~~

appveyor.yml

@@ -1,7 +1,7 @@
 image:
   - Visual Studio 2022
 
-version: 1.13.2-{build}
+version: 2.0.0-{build}
 
 skip_tags: false
 
@@ -27,21 +27,21 @@ build: off
 build_script:
   - git submodule update --init --recursive
   - cargo build --verbose --release
-  - cp target\release\http.exe http-v1.13.2.exe
-  - strip --strip-all --remove-section=.comment --remove-section=.note http-v1.13.2.exe
-  - makensis -DHTTP_VERSION=v1.13.2 install.nsi
+  - cp target\release\http.exe http-v2.0.0.exe
+  - strip --strip-all --remove-section=.comment --remove-section=.note http-v2.0.0.exe
+  - makensis -DHTTP_VERSION=v2.0.0 install.nsi
 
 test: off
 test_script:
   - cargo test --verbose --release
 
 artifacts:
-  - path: http-v1.13.2.exe
-  - path: http v1.13.2 installer.exe
+  - path: http-v2.0.0.exe
+  - path: http v2.0.0 installer.exe
 
 deploy:
   provider: GitHub
-  artifact: /http.*v1.13.2.*\.exe/
+  artifact: /http.*v2.0.0.*\.exe/
   auth_token:
     secure: ZTXvCrv9y01s7Hd60w8W7NaouPnPoaw9YJt9WhWQ2Pep8HLvCikt9Exjkz8SGP9P
   on:

assets/adjust_tz.js

@@ -1,15 +1,14 @@
 "use strict";
 
-window.addEventListener("load", function() {
-  const FORMAT = "yyyy-MM-dd HH:mm:ss";
-
+window.addEventListener("DOMContentLoaded", function() {
   let modtime_h = document.getElementsByTagName("th")[2];
   if(modtime_h)
-    modtime_h.innerText = modtime_h.innerText.replace("(UTC)", "").trim();
+    modtime_h.innerText = modtime_h.innerText.replace(" (UTC)", "");
 
-  let timestamps = document.getElementsByClassName("datetime");
-  Array.from(timestamps).forEach(function(r) {
-    let dt = r.innerText.replace("UTC", "").trim();
-    r.innerText = Date.parseString(dt, FORMAT).format(FORMAT)
-  });
+  let timestamps = document.getElementsByTagName("time");
+  for(let r of timestamps) {
+    let dt = new Date(parseInt(r.getAttribute("ms")));
+    dt.setMinutes(dt.getMinutes() - dt.getTimezoneOffset())
+    r.innerText = dt.toISOString().slice(0, 19).replace("T", " ");
+  }
 });

assets/directory_listing.html

@@ -2,25 +2,19 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="application-name" content="http">
-    <meta name="author" content="http developers">
+    <meta name="generator" content="{generator}">
     <meta name="description" content="Directory listing of {0}">
     <meta name="color-scheme" content="light dark">
-    <link href="{favicon}" rel="icon" type="image/x-icon" />
-    <script type="text/javascript">{date}</script>
-    <script type="text/javascript">{adjust_tz}</script>
-    {1}
+    <link rel="icon" href="{favicon}" />
+    <script>{adjust_tz}</script>
+    {1}{2}{3}
     <title>Directory listing — {0}</title>
-    <style type="text/css">
+    <style>
       abbr[title] {
         border-bottom: none;
         text-decoration: none;
       }
 
-      .pre-list {
-        margin-bottom: 0;
-      }
-
       table {
         border-collapse: collapse;
       }
@@ -41,7 +35,7 @@
         padding-left: 5pt;
       }
 
-      tr:nth-child(n+4) td:nth-child(5) a {
+      td:nth-child(5) a {
         display: inline-block;
       }
 
@@ -54,8 +48,8 @@
         height: 1em;
       }
 
-      tr:hover {
-        background-color: #eee;
+      tr:hover, tr:target {
+        background-color: #80808080;
       }
 
       tr {
@@ -116,20 +110,18 @@
     </style>
   </head>
   <body>
-    <div>
-      <p class="pre-list">The requested directory {0} contains the following files:</p>
-      <table>
-        <tr><th></th> <th>Name</th> <th>Last modified (UTC)</th> <th>Size</th> {5}</tr>
-        {2}
-        {6}
-        {3}
-      </table>
-    </div>
+    <p style="margin-bottom: 0;">The requested directory {0} contains the following files:</p>
+    <table>
+      <tr><th></th> <th>Name</th> <th>Last modified (UTC)</th> <th>Size</th> {7}</tr>
+      {4}
+      {8}
+      {5}
+    </table>
     <p></p>
-    {4}
+    {6}
     <hr />
     <p>
-      <a href="https://github.com/thecoshman/http">Host These Things Please</a> — a basic HTTP server for hosting a folder fast and simply
+      <a href="//github.com/thecoshman/http">Host These Things Please</a> — a basic HTTP server for hosting a folder fast and simply
     </p>
   </body>
 </html>

assets/directory_listing_mobile.html

@@ -2,55 +2,34 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="application-name" content="http">
-    <meta name="author" content="http developers">
+    <meta name="generator" content="{generator}">
     <meta name="description" content="Directory listing of {0}">
     <meta name="viewport" content="initial-scale=1.0,maximum-scale=1,width=device-width">
     <meta name="color-scheme" content="light dark">
-    <link href="{favicon}" rel="icon" type="image/x-icon" />
-    <script type="text/javascript">{date}</script>
-    <script type="text/javascript">{adjust_tz}</script>
-    {2}
+    <link rel="icon" href="{favicon}" />
+    <script>{adjust_tz}</script>
+    {1}{2}{3}
     <title>Directory listing — {0}</title>
-    <style type="text/css">
-      .list {
+    <style>
+      body > * {
         display: block;
-        padding-left: 15px;
-        padding-right: 15px;
+        padding: 7px 15px;
+        border-bottom: solid 1px #00000050;
       }
 
-      .heading {
-        background-color: #0000000F;
-      }
-
-      .entry.top, .heading.top-border {
-        border-top: solid 1px #00000050;
-      }
-
-      .top {
-        padding-top: 7px;
-      }
-
-      .manage {
-        float: right;
+      body > *:target {
+        background-color: #80808080;
       }
 
-      .bottom {
-        padding-bottom: 7px;
-      }
-
-      .datetime {
-        float: left;
-        font-size: 75%;
+      .heading {
+        background-color: #8080801E;
       }
 
-      .size {
+      .manage, .size {
         float: right;
-        font-size: 75%;
       }
 
-      .marker {
-        opacity: 0;
+      time, .size {
         font-size: 75%;
       }
 
@@ -64,10 +43,6 @@
         word-wrap: break-word;
       }
 
-      #newdir_input > input[type="text"] {
-        margin-left: 0.5em;
-      }
-
       .dir_icon:before {
         content: url('{dir_icon}');
         margin-right: 0.5em;
@@ -100,7 +75,7 @@
 
       .new_dir_icon:before {
         content: url('{new_dir_icon}');
-        margin-right: 0.5em;
+        margin-right: 0.5rem;
       }
 
       .delete_file_icon:before {
@@ -125,15 +100,11 @@
     </style>
   </head>
   <body>
-    <div>
-      <a href="{1}{0}" class="list heading top bottom">{0}</a>
-      {3}
-      {6}
-      {4}
-    </div>
+    <a href="{0}" class="heading">{0}</a>
+    {4}
+    {7}
     {5}
-    <a href="https://github.com/thecoshman/http" class="list heading top top-border bottom">
-      Host These Things Please — a basic HTTP server for hosting a folder fast and simply
-    </a>
+    {6}
+    <a href="//github.com/thecoshman/http" class="heading">Host These Things Please — a basic HTTP server for hosting a folder fast and simply</a>
   </body>
 </html>