Clean up nix setup, only toolchain.nix is still in a weird state

windows and linux builds fully working
Windows pure shell build works
2023-12-11 17:46:18 +01:00 · 2023-12-10 17:48:12 +01:00 · 2023-12-10 16:17:06 +01:00 · 2023-12-10 15:00:43 +01:00 · 2023-12-10 14:06:36 +01:00 · 2023-12-10 10:45:48 +01:00
17 changed files with 291 additions and 6640 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@ -1,3 +0,0 @@
-[target.x86_64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
--- a/.gitignore
+++ b/.gitignore
@ -3,4 +3,6 @@
 /pki
 **/*.rs.bk
 *.swp
-/.direnv
+/.direnv
+/.cargo
+/result
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1271,7 +1271,6 @@ dependencies = [
 "http-range",
 "httpdate",
 "hyper",
- "hyperlocal",
 "idna",
 "md-5",
 "multer",
@ -1465,7 +1464,6 @@ dependencies = [
 "garage_util",
 "http",
 "hyper",
- "hyperlocal",
 "opentelemetry",
 "percent-encoding",
 "tokio",
@ -1778,19 +1776,6 @@ dependencies = [
 "tokio-io-timeout",
 ]

-[[package]]
-name = "hyperlocal"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c"
-dependencies = [
- "futures-util",
- "hex",
- "hyper",
- "pin-project",
- "tokio",
-]
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.57"
--- a/Cargo.nix
+++ b/Cargo.nix
--- a/default.nix
+++ b/default.nix
@ -1,56 +1,166 @@
-{ system ? builtins.currentSystem, git_version ? null, }:
-
-with import ./nix/common.nix;
+{
+  buildSystem ? builtins.currentSystem,
+  targetSystem ? buildSystem,
+  gitVersion ? null,
+  release ? false,
+  features ? null,
+}:

 let
-  pkgs = import pkgsSrc { };
-  compile = import ./nix/compile.nix;
-
-  build_debug_and_release = (target: {
-    debug = (compile {
-      inherit system target git_version pkgsSrc cargo2nixOverlay;
-      release = false;
-    }).workspace.garage { compileMode = "build"; };
-
-    release = (compile {
-      inherit system target git_version pkgsSrc cargo2nixOverlay;
-      release = true;
-    }).workspace.garage { compileMode = "build"; };
-  });
-
-  test = (rustPkgs:
-    pkgs.symlinkJoin {
-      name = "garage-tests";
-      paths =
-        builtins.map (key: rustPkgs.workspace.${key} { compileMode = "test"; })
-        (builtins.attrNames rustPkgs.workspace);
-    });
-
-in {
-  pkgs = {
-    amd64 = build_debug_and_release "x86_64-unknown-linux-musl";
-    i386 = build_debug_and_release "i686-unknown-linux-musl";
-    arm64 = build_debug_and_release "aarch64-unknown-linux-musl";
-    arm = build_debug_and_release "armv6l-unknown-linux-musleabihf";
+  pkgsSrc = import ./nix/pkgs.nix;
+  newBuildTarget = {
+    nixPkgsSystem,
+    rustTarget ? nixPkgsSystem,
+    nativeBuildInputs ? pkgsCross: [],
+    rustFlags ? pkgsCross: [],
+  }: {
+    inherit nixPkgsSystem rustTarget nativeBuildInputs rustFlags;
  };
-  test = {
-    amd64 = test (compile {
-      inherit system git_version pkgsSrc cargo2nixOverlay;
-      target = "x86_64-unknown-linux-musl";
-      features = [
-        "garage/bundled-libs"
-        "garage/k2v"
-        "garage/sled"
-        "garage/lmdb"
-        "garage/sqlite"
+
+  # centralize per-target configuration in a single place.
+  buildTargets = {
+    "x86_64-linux" = newBuildTarget {
+      nixPkgsSystem = "x86_64-unknown-linux-musl";
+    };
+
+    "i686-linux" = newBuildTarget {
+      nixPkgsSystem = "i686-unknown-linux-musl";
+    };
+
+    "aarch64-linux" = newBuildTarget {
+      nixPkgsSystem = "aarch64-unknown-linux-musl";
+    };
+
+    # Old Raspberry Pi's (not currently supported due to linking errors with
+    # libsqlite3 and libsodium
+    #"armv6l-linux" = newBuildTarget {
+    #  nixPkgsSystem = "armv6l-unknown-linux-musleabihf";
+    #  rustTarget = "arm-unknown-linux-musleabihf";
+    #};
+
+    "x86_64-windows" = newBuildTarget {
+      nixPkgsSystem = "x86_64-w64-mingw32";
+      rustTarget = "x86_64-pc-windows-gnu";
+      nativeBuildInputs = pkgsCross: [ pkgsCross.windows.pthreads ];
+      rustFlags = pkgsCross: [
+        "-C" "link-arg=-L${pkgsCross.windows.pthreads}/lib"
      ];
-    });
+    };
  };
-  clippy = {
-    amd64 = (compile {
-      inherit system git_version pkgsSrc cargo2nixOverlay;
-      target = "x86_64-unknown-linux-musl";
-      compiler = "clippy";
-    }).workspace.garage { compileMode = "build"; };
+
+  buildTarget = buildTargets.${targetSystem};
+
+  pkgs = import pkgsSrc { system = buildSystem; };
+  pkgsCross = import pkgsSrc {
+    system = buildSystem;
+    crossSystem.config = buildTarget.nixPkgsSystem;
  };
+
+  rustTarget = buildTarget.rustTarget;
+
+  toolchain = let
+    fenix = import (pkgs.fetchFromGitHub {
+      owner = "nix-community";
+      repo = "fenix";
+      rev = "81ab0b4f7ae9ebb57daa0edf119c4891806e4d3a";
+      hash = "sha256-bZmI7ytPAYLpyFNgj5xirDkKuAniOkj1xHdv5aIJ5GM=";
+    }) {
+      system = buildSystem;
+    };
+
+    mkToolchain = fenixTarget: fenixTarget.toolchainOf {
+      channel = "1.68.2";
+      sha256 = "sha256-4vetmUhTUsew5FODnjlnQYInzyLNyDwocGa4IvMk3DM=";
+    };
+  in
+    fenix.combine [
+      (mkToolchain fenix).rustc
+      (mkToolchain fenix).rustfmt
+      (mkToolchain fenix).cargo
+      (mkToolchain fenix).clippy
+      (mkToolchain fenix.targets.${rustTarget}).rust-std
+    ];
+
+  naersk = let
+    naerskSrc = pkgs.fetchFromGitHub {
+      owner = "nix-community";
+      repo = "naersk";
+      rev = "d9a33d69a9c421d64c8d925428864e93be895dcc";
+      hash = "sha256-e136hTT7LqQ2QjOTZQMW+jnsevWwBpMj78u6FRUsH9I=";
+    };
+  in
+    pkgs.callPackages naerskSrc {
+      cargo = toolchain;
+      rustc = toolchain;
+    };
+
+  builtFeatures = if features != null then
+      features
+  else (
+    [ "garage/bundled-libs" "garage/sled" "garage/lmdb" "garage/k2v" ] ++ (
+      if release then [
+        "garage/consul-discovery"
+        "garage/kubernetes-discovery"
+        "garage/metrics"
+        "garage/telemetry-otlp"
+        "garage/sqlite"
+      ] else [ ]
+    )
+  );
+
+  # For some reason the pkgsCross.pkgsStatic build of libsodium doesn't contain
+  # a `.a` file when compiled to a windows target, but rather contains
+  # a `.dll.a` file which libsodium-sys doesn't pick up on. Copying the one to
+  # the be the other seems to work.
+  libsodium = pkgs.runCommand "libsodium-wrapped" {
+    libsodium = pkgsCross.pkgsStatic.libsodium;
+  } ''
+    cp -rL "$libsodium" "$out"
+    chmod -R +w "$out"
+    if [ ! -e "$out"/lib/libsodium.a ] && [ -f "$out"/lib/libsodium.dll.a ]; then
+      cp "$out"/lib/libsodium.dll.a "$out"/lib/libsodium.a
+    fi
+  '';
+
+in rec {
+  inherit pkgs pkgsCross;
+
+  # Exported separately so it can be used from shell.nix
+  buildEnv = rec {
+    nativeBuildInputs = (buildTarget.nativeBuildInputs pkgsCross) ++ [
+      toolchain
+      pkgs.protobuf
+
+      # Required for shell because of rust dependency build scripts which must
+      # run on the build system.
+      pkgs.stdenv.cc
+    ];
+
+    SODIUM_LIB_DIR = "${libsodium}/lib";
+
+    # Required because ring crate is special. This also seems to have
+    # fixed some issues with the x86_64-windows cross-compile :shrug:
+    TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
+
+    CARGO_BUILD_TARGET = rustTarget;
+    CARGO_BUILD_RUSTFLAGS = [
+      "-C" "target-feature=+crt-static"
+      "-C" "link-arg=-static"
+
+      # https://github.com/rust-lang/cargo/issues/4133
+      "-C" "linker=${TARGET_CC}"
+    ] ++ (buildTarget.rustFlags pkgsCross);
+  };
+
+  build = naersk.buildPackage (rec {
+    inherit release;
+
+    src = ./.;
+    strictDeps = true;
+    doCheck = false;
+
+    cargoBuildOptions = prev: prev++[
+      "--features=${builtins.concatStringsSep "," builtFeatures}"
+    ];
+  } // buildEnv);
 }
--- a/flake.lock
+++ b/flake.lock
@ -1,31 +1,5 @@
 {
  "nodes": {
-    "cargo2nix": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1666087781,
-        "narHash": "sha256-trKVdjMZ8mNkGfLcY5LsJJGtdV3xJDZnMVrkFjErlcs=",
-        "owner": "Alexis211",
-        "repo": "cargo2nix",
-        "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Alexis211",
-        "repo": "cargo2nix",
-        "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
-        "type": "github"
-      }
-    },
    "flake-compat": {
      "locked": {
        "lastModified": 1688025799,
@ -46,54 +20,19 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
+        "id": "flake-utils",
+        "type": "indirect"
      }
    },
    "nixpkgs": {
-      "locked": {
-        "lastModified": 1682109806,
-        "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2362848adf8def2866fabbffc50462e929d7fffb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
      "locked": {
        "lastModified": 1682423271,
        "narHash": "sha256-WHhl1GiOij1ob4cTLL+yhqr+vFOUH8E5wAX8Ir8fvjE=",
@ -111,32 +50,9 @@
    },
    "root": {
      "inputs": {
-        "cargo2nix": "cargo2nix",
        "flake-compat": "flake-compat",
-        "flake-utils": [
-          "cargo2nix",
-          "flake-utils"
-        ],
-        "nixpkgs": "nixpkgs_2"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1682389182,
-        "narHash": "sha256-8t2nmFnH+8V48+IJsf8AK51ebXNlVbOSVYOpiqJKvJE=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "74f1a64dd28faeeb85ef081f32cad2989850322c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
      }
    },
    "systems": {
@ -153,21 +69,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -8,50 +8,23 @@

  inputs.flake-compat.url = "github:nix-community/flake-compat";

-  inputs.cargo2nix = {
-    # As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
-    url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
-
-    # As of 2023-04-25:
-    # - my two patches were merged into unstable (one for clippy and one to "fix" feature detection)
-    # - rustc v1.66
-    # url = "github:cargo2nix/cargo2nix/8fb57a670f7993bfc24099c33eb9c5abb51f29a2";
-
-    # Rust overlay as of 2023-04-25
-    inputs.rust-overlay.url =
-      "github:oxalica/rust-overlay/74f1a64dd28faeeb85ef081f32cad2989850322c";
-
-    inputs.nixpkgs.follows = "nixpkgs";
-    inputs.flake-compat.follows = "flake-compat";
-  };
-
-  inputs.flake-utils.follows = "cargo2nix/flake-utils";
-
-  outputs = { self, nixpkgs, cargo2nix, flake-utils, ... }:
+  outputs = { self, nixpkgs, flake-utils, ... }:
    let
-      git_version = self.lastModifiedDate;
+      gitVersion = self.lastModifiedDate;
      compile = import ./nix/compile.nix;
    in
    flake-utils.lib.eachDefaultSystem (system:
      let pkgs = nixpkgs.legacyPackages.${system};
      in {
        packages = {
-          default = (compile {
-            inherit system git_version;
-            pkgsSrc = nixpkgs;
-            cargo2nixOverlay = cargo2nix.overlays.default;
+          default = (import ./default.nix {
+            inherit gitVersion;
+            buildSystem = system;
            release = true;
-          }).workspace.garage { compileMode = "build"; };
+          }).build;
        };
-        devShell = (compile {
-          inherit system git_version;
-          pkgsSrc = nixpkgs;
-          cargo2nixOverlay = cargo2nix.overlays.default;
-          release = false;
-        }).workspaceShell { packages = with pkgs; [
-          rustfmt
-          clang
-          mold
-        ]; };
+        devShell = (import ./shell.nix {
+          buildSystem = system;
+        }).rust;
      });
 }
--- a/nix/build_index.nix
+++ b/nix/build_index.nix
@ -1,6 +1,6 @@
 { path ? "/../aws-list.txt", }:

-with import ./common.nix;
+with import ./pkgs.nix;
 let
  pkgs = import pkgsSrc { };
  lib = pkgs.lib;
--- a/nix/common.nix
+++ b/nix/common.nix
@ -1,17 +0,0 @@
-let
-  lock = builtins.fromJSON (builtins.readFile ../flake.lock);
-
-  inherit (lock.nodes.flake-compat.locked) owner repo rev narHash;
-
-  flake-compat = fetchTarball {
-    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
-    sha256 = narHash;
-  };
-
-  flake = (import flake-compat { system = builtins.currentSystem; src = ../.; });
-in
-rec {
-  pkgsSrc = flake.defaultNix.inputs.nixpkgs;
-  cargo2nix = flake.defaultNix.inputs.cargo2nix;
-  cargo2nixOverlay = cargo2nix.overlays.default;
-}
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@ -0,0 +1,8 @@
+let
+  lock = builtins.fromJSON (builtins.readFile ../flake.lock);
+  inherit (lock.nodes.nixpkgs.locked) owner repo rev narHash;
+in
+  fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
+    sha256 = narHash;
+  }
--- a/shell.nix
+++ b/shell.nix
@ -1,12 +1,12 @@
-{ system ? builtins.currentSystem, }:
+{
+  buildSystem ? builtins.currentSystem,
+  targetSystem ? buildSystem,
+}:

-with import ./nix/common.nix;
+with import ./nix/pkgs.nix;

 let
-  pkgs = import pkgsSrc {
-    inherit system;
-    overlays = [ cargo2nixOverlay ];
-  };
+  inherit (import ./default.nix { inherit buildSystem targetSystem; }) pkgs pkgsCross buildEnv;
  kaniko = (import ./nix/kaniko.nix) pkgs;
  manifest-tool = (import ./nix/manifest-tool.nix) pkgs;
  winscp = (import ./nix/winscp.nix) pkgs;
@ -14,22 +14,13 @@ let
 in {
  # --- Rust Shell ---
  # Use it to compile Garage
-  rust = pkgs.mkShell {
-    nativeBuildInputs = with pkgs; [
-      #rustPlatform.rust.rustc
-      rustPlatform.rust.cargo
-      clang
-      mold
-      #clippy
-      rustfmt
-      #perl
-      #protobuf
-      #pkg-config
-      #openssl
-      file
-      #cargo2nix.packages.x86_64-linux.cargo2nix
+  rust = pkgsCross.mkShell (buildEnv // {
+    inputsFrom = [
+      kaniko
+      manifest-tool
+      winscp
    ];
-  };
+  });

  # --- Integration shell ---
  # Use it to test Garage with common S3 clients
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@ -45,7 +45,7 @@ http = "0.2"
 httpdate = "1.0"
 http-range = "0.1"
 hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream"] }
-hyperlocal = { version = "0.8.0", default-features = false, features = ["server"] }
+#hyperlocal = { version = "0.8.0", default-features = false, features = ["server"] }
 multer = "2.0"
 percent-encoding = "2.1.0"
 roxmltree = "0.18"
--- a/src/api/generic_server.rs
+++ b/src/api/generic_server.rs
@ -1,5 +1,4 @@
-use std::fs::{self, Permissions};
-use std::os::unix::fs::PermissionsExt;
+//use std::fs::{self, Permissions};
 use std::sync::Arc;

 use async_trait::async_trait;
@ -12,9 +11,9 @@ use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Request, Response, Server};
 use hyper::{HeaderMap, StatusCode};

-use hyperlocal::UnixServerExt;
+//use hyperlocal::UnixServerExt;

-use tokio::net::UnixStream;
+//use tokio::net::UnixStream;

 use opentelemetry::{
 	global,
@ -114,18 +113,18 @@ impl<A: ApiHandler> ApiServer<A> {
 			}
 		});

-		let unix_service = make_service_fn(|_: &UnixStream| {
-			let this = self.clone();
+		//let unix_service = make_service_fn(|_: &UnixStream| {
+		//	let this = self.clone();

-			let path = bind_addr.to_string();
-			async move {
-				Ok::<_, GarageError>(service_fn(move |req: Request<Body>| {
-					let this = this.clone();
+		//	let path = bind_addr.to_string();
+		//	async move {
+		//		Ok::<_, GarageError>(service_fn(move |req: Request<Body>| {
+		//			let this = this.clone();

-					this.handler(req, path.clone())
-				}))
-			}
-		});
+		//			this.handler(req, path.clone())
+		//		}))
+		//	}
+		//});

 		info!(
 			"{} API server listening on {}",
@ -140,23 +139,24 @@ impl<A: ApiHandler> ApiServer<A> {
 					.with_graceful_shutdown(shutdown_signal)
 					.await?
 			}
-			UnixOrTCPSocketAddress::UnixSocket(ref path) => {
-				if path.exists() {
-					fs::remove_file(path)?
-				}
+			UnixOrTCPSocketAddress::UnixSocket(_path) => {
+				panic!("Unix sockets are not supported in this fork") // TODO(mediocregopher)
+			} //UnixOrTCPSocketAddress::UnixSocket(ref path) => {
+			  //    use std::os::unix::fs::PermissionsExt;
+			  //    remove_unix_socket_if_present(path).await?;

-				let bound = Server::bind_unix(path)?;
+			  //	let bound = Server::bind_unix(path)?;

-				fs::set_permissions(
-					path,
-					Permissions::from_mode(unix_bind_addr_mode.unwrap_or(0o222)),
-				)?;
+			  //	fs::set_permissions(
+			  //		path,
+			  //		Permissions::from_mode(unix_bind_addr_mode.unwrap_or(0o222)),
+			  //	)?;

-				bound
-					.serve(unix_service)
-					.with_graceful_shutdown(shutdown_signal)
-					.await?;
-			}
+			  //	bound
+			  //		.serve(unix_service)
+			  //		.with_graceful_shutdown(shutdown_signal)
+			  //		.await?;
+			  //}
 		};

 		Ok(())
--- a/src/block/manager.rs
+++ b/src/block/manager.rs
@ -771,11 +771,7 @@ impl BlockManagerLocked {
 			// Now, we do an fsync on the containing directory, to ensure that the rename
 			// is persisted properly. See:
 			// http://thedjbway.b0llix.net/qmail/syncdir.html
-			let dir = fs::OpenOptions::new()
-				.read(true)
-				.mode(0)
-				.open(directory)
-				.await?;
+			let dir = fs::OpenOptions::new().read(true).open(directory).await?;
 			dir.sync_all().await?;
 			drop(dir);
 		}
--- a/src/rpc/system.rs
+++ b/src/rpc/system.rs
@ -3,7 +3,6 @@ use std::collections::HashMap;
 use std::io::{Read, Write};
 use std::net::{IpAddr, SocketAddr};
 use std::path::{Path, PathBuf};
-use std::sync::atomic::Ordering;
 use std::sync::{Arc, RwLock};
 use std::time::{Duration, Instant};

@ -198,6 +197,20 @@ pub fn read_node_id(metadata_dir: &Path) -> Result<NodeID, Error> {
 	Ok(NodeID::from_slice(&key[..]).unwrap())
 }

+#[cfg(not(windows))]
+fn set_private_key_perms(path: &Path) -> Result<(), Error> {
+	use std::os::unix::fs::PermissionsExt;
+	let perm = std::fs::Permissions::from_mode(0o600);
+	std::fs::set_permissions(path, perm)?;
+	Ok(())
+}
+
+#[cfg(windows)]
+fn set_private_key_perms(_path: &Path) -> Result<(), Error> {
+	// TODO(mediocregopher) figure out how to do this, but it's not strictly necessary
+	Ok(())
+}
+
 pub fn gen_node_key(metadata_dir: &Path) -> Result<NodeKey, Error> {
 	let mut key_file = metadata_dir.to_path_buf();
 	key_file.push("node_key");
@ -222,11 +235,8 @@ pub fn gen_node_key(metadata_dir: &Path) -> Result<NodeKey, Error> {
 		let (pubkey, key) = ed25519::gen_keypair();

 		{
-			use std::os::unix::fs::PermissionsExt;
 			let mut f = std::fs::File::create(key_file.as_path())?;
-			let mut perm = f.metadata()?.permissions();
-			perm.set_mode(0o600);
-			std::fs::set_permissions(key_file.as_path(), perm)?;
+			set_private_key_perms(key_file.as_path())?;
 			f.write_all(&key[..])?;
 		}

@ -890,6 +900,18 @@ impl NodeStatus {
 		}
 	}

+	#[cfg(windows)]
+	fn update_disk_usage(
+		&mut self,
+		_meta_dir: &Path,
+		_data_dir: &DataDirEnum,
+		_metrics: &SystemMetrics,
+	) {
+		// TODO(mediocregopher) it'd be nice to have this for windows too, but it seems to only be
+		// used for OpenTelemetry so it's not a real requirement.
+	}
+
+	#[cfg(not(windows))]
 	fn update_disk_usage(
 		&mut self,
 		meta_dir: &Path,
@ -897,6 +919,7 @@ impl NodeStatus {
 		metrics: &SystemMetrics,
 	) {
 		use nix::sys::statvfs::statvfs;
+		use std::sync::atomic::Ordering;
 		let mount_avail = |path: &Path| match statvfs(path) {
 			Ok(x) => {
 				let avail = x.blocks_available() as u64 * x.fragment_size() as u64;
@ -955,6 +978,7 @@ impl NodeStatus {
 	}
 }

+#[cfg(not(windows))]
 fn get_default_ip() -> Option<IpAddr> {
 	pnet_datalink::interfaces()
 		.iter()
@ -963,6 +987,11 @@ fn get_default_ip() -> Option<IpAddr> {
 		.map(|a| a.ip())
 }

+#[cfg(windows)]
+fn get_default_ip() -> Option<IpAddr> {
+    None
+}
+
 async fn resolve_peers(peers: &[String]) -> Vec<(NodeID, SocketAddr)> {
 	let mut ret = vec![];

--- a/src/web/Cargo.toml
+++ b/src/web/Cargo.toml
@ -27,7 +27,7 @@ futures = "0.3"

 http = "0.2"
 hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream"] }
-hyperlocal = { version = "0.8.0", default-features = false, features = ["server"] }
+#hyperlocal = { version = "0.8.0", default-features = false, features = ["server"] }

 tokio = { version = "1.0", default-features = false, features = ["net"] }

--- a/src/web/web_server.rs
+++ b/src/web/web_server.rs
@ -1,5 +1,5 @@
-use std::fs::{self, Permissions};
-use std::os::unix::prelude::PermissionsExt;
+//use std::fs::{self, Permissions};
+//use std::os::unix::prelude::PermissionsExt;
 use std::{convert::Infallible, sync::Arc};

 use futures::future::Future;
@ -11,9 +11,9 @@ use hyper::{
 	Body, Method, Request, Response, Server, StatusCode,
 };

-use hyperlocal::UnixServerExt;
+//use hyperlocal::UnixServerExt;

-use tokio::net::UnixStream;
+//use tokio::net::UnixStream;

 use opentelemetry::{
 	global,
@ -100,18 +100,18 @@ impl WebServer {
 			}
 		});

-		let unix_service = make_service_fn(|_: &UnixStream| {
-			let web_server = web_server.clone();
+		//let unix_service = make_service_fn(|_: &UnixStream| {
+		//	let web_server = web_server.clone();

-			let path = addr.to_string();
-			async move {
-				Ok::<_, Error>(service_fn(move |req: Request<Body>| {
-					let web_server = web_server.clone();
-
-					web_server.handle_request(req, path.clone())
-				}))
-			}
-		});
+		//	let path = addr.to_string();
+		//	async move {
+		//		remove_unix_socket_if_present(&path).await.expect("could not remove existing unix socket");
+		//		Ok::<_, Error>(service_fn(move |req: Request<Body>| {
+		//			let web_server = web_server.clone();
+		//			web_server.handle_request(req, path.clone())
+		//		}))
+		//	}
+		//});

 		info!("Web server listening on {}", addr);

@ -122,20 +122,22 @@ impl WebServer {
 					.with_graceful_shutdown(shutdown_signal)
 					.await?
 			}
-			UnixOrTCPSocketAddress::UnixSocket(ref path) => {
-				if path.exists() {
-					fs::remove_file(path)?
-				}
+			UnixOrTCPSocketAddress::UnixSocket(_path) => {
+				panic!("Unix sockets are not supported in this fork") // TODO(mediocregopher)
+			} //UnixOrTCPSocketAddress::UnixSocket(ref path) => {
+			  //	if path.exists() {
+			  //		fs::remove_file(path)?
+			  //	}

-				let bound = Server::bind_unix(path)?;
+			  //	let bound = Server::bind_unix(path)?;

-				fs::set_permissions(path, Permissions::from_mode(0o222))?;
+			  //	fs::set_permissions(path, Permissions::from_mode(0o222))?;

-				bound
-					.serve(unix_service)
-					.with_graceful_shutdown(shutdown_signal)
-					.await?;
-			}
+			  //	bound
+			  //		.serve(unix_service)
+			  //		.with_graceful_shutdown(shutdown_signal)
+			  //		.await?;
+			  //}
 		};

 		Ok(())
Author	SHA1	Message	Date
Brian Picciano	2919906843	Clean up nix setup, only toolchain.nix is still in a weird state	2023-12-11 17:46:18 +01:00
Brian Picciano	a34cec60d4	windows and linux builds fully working	2023-12-10 17:48:12 +01:00
Brian Picciano	e46bcfda3f	Windows pure shell build works	2023-12-10 16:17:06 +01:00
Brian Picciano	f6b1f1fc23	Fixed nix shell for local build	2023-12-10 15:00:43 +01:00
Brian Picciano	7008e1653b	Got windows build working within a shell, with no features enabled	2023-12-10 14:06:36 +01:00
Brian Picciano	bd09a1ad7b	Code changes for windows, mostly to get rid of unix socket listening because tokio doesn't support it	2023-12-10 10:45:48 +01:00
Brian Picciano	b84a60ba69	Fixed libsodium issue for windows build	2023-12-05 15:05:10 +01:00
Brian Picciano	25f55cf24d	use fenix/naersk for nix building, got local x86_64-linux build working	2023-12-03 22:16:36 +01:00