Bump actix-web from 4.0.1 to 4.2.1

Bumps [actix-web](https://github.com/actix/actix-web) from 4.0.1 to 4.2.1. - [Release notes](https://github.com/actix/actix-web/releases) - [Changelog](https://github.com/actix/actix-web/blob/master/CHANGES.md) - [Commits](https://github.com/actix/actix-web/compare/web-v4.0.1...web-v4.2.1) --- updated-dependencies: - dependency-name: actix-web dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-10-01 10:04:50 +00:00
8 changed files with 26 additions and 226 deletions
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -1,33 +0,0 @@
-name: Docker Image Creation
-run-name: ${{ gitea.actor }} building Docker image
-on: [push]
-
-jobs:
-  build-docker:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v4
-
-      - name: Login to Gitea Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.bluequartz.xyz
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: git.bluequartz.xyz/kellen/bin
-
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@

 # These are backup files generated by rustfmt
 **/*.rs.bk
-result
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,9 +45,9 @@ dependencies = [

 [[package]]
 name = "actix-http"
-version = "3.0.4"
+version = "3.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5885cb81a0d4d0d322864bea1bb6c2a8144626b4fdc625d4c51eba197e7797a"
+checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724"
 dependencies = [
 "actix-codec",
 "actix-rt",
@@ -70,13 +70,13 @@ dependencies = [
 "itoa",
 "language-tags",
 "local-channel",
- "log",
 "mime",
 "percent-encoding",
 "pin-project-lite",
 "rand 0.8.5",
- "sha-1",
+ "sha1",
 "smallvec",
+ "tracing",
 "zstd",
 ]

@@ -155,9 +155,9 @@ dependencies = [

 [[package]]
 name = "actix-web"
-version = "4.0.1"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4e5ebffd51d50df56a3ae0de0e59487340ca456f05dd0b90c0a7a6dd6a74d31"
+checksum = "d48f7b6534e06c7bfc72ee91db7917d4af6afe23e7d223b51e68fffbb21e96b9"
 dependencies = [
 "actix-codec",
 "actix-http",
@@ -177,6 +177,7 @@ dependencies = [
 "encoding_rs",
 "futures-core",
 "futures-util",
+ "http",
 "itoa",
 "language-tags",
 "log",
@@ -195,9 +196,9 @@ dependencies = [

 [[package]]
 name = "actix-web-codegen"
-version = "4.0.0"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7525bedf54704abb1d469e88d7e7e9226df73778798a69cea5022d53b2ae91bc"
+checksum = "1fa9362663c8643d67b2d5eafba49e4cb2c8a053a29ed00a0bea121f17c76b13"
 dependencies = [
 "actix-router",
 "proc-macro2",
@@ -688,9 +689,9 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.10.3"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
 dependencies = [
 "block-buffer",
 "crypto-common",
@@ -1099,9 +1100,9 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"

 [[package]]
 name = "http"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
 "bytes",
 "fnv",
@@ -1789,10 +1790,10 @@ dependencies = [
 ]

 [[package]]
-name = "sha-1"
-version = "0.10.0"
+name = "sha1"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
 dependencies = [
 "cfg-if",
 "cpufeatures",
@@ -2267,18 +2268,18 @@ dependencies = [

 [[package]]
 name = "zstd"
-version = "0.10.0+zstd.1.5.2"
+version = "0.11.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
 dependencies = [
 "zstd-safe",
 ]

 [[package]]
 name = "zstd-safe"
-version = "4.1.4+zstd.1.5.2"
+version = "5.0.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
 dependencies = [
 "libc",
 "zstd-sys",
@@ -2286,9 +2287,9 @@ dependencies = [

 [[package]]
 name = "zstd-sys"
-version = "1.6.3+zstd.1.5.2"
+version = "2.0.1+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8"
+checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
 dependencies = [
 "cc",
 "libc",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] }
 rand = { version = "0.8" }
 gpw = "0.1"
 actix = "0.13"
-actix-web = "4.0"
+actix-web = "4.2"
 htmlescape = "0.3"
 askama = "0.11"
 bat = "0.20"
--- a/5
+++ b/5
@@ -1,4 +1,4 @@
-FROM rust:1-slim-bookworm AS builder
+FROM rust:1-slim AS builder

 RUN apt update && apt install -y libclang-dev

@@ -7,7 +7,8 @@ WORKDIR /sources
 RUN cargo build --release
 RUN chown nobody:nogroup /sources/target/release/bin

-FROM gcr.io/distroless/cc-debian12
+
+FROM debian:bullseye-slim
 COPY --from=builder /sources/target/release/bin /pastebin

 USER nobody
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +0,0 @@
-version: '3'
-services:
-  bin:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "8000:8000"
--- a/flake.lock
+++ b/flake.lock
@@ -1,77 +0,0 @@
-{
-  "nodes": {
-    "naersk": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1662220400,
-        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1670118144,
-        "narHash": "sha256-tdh9H4oomljZaKpCkZox8jmwt8p78oGLpK9cjFBy3Qk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "95f1ec721652d91a2993311d6cf537d3724690be",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1670118144,
-        "narHash": "sha256-tdh9H4oomljZaKpCkZox8jmwt8p78oGLpK9cjFBy3Qk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "95f1ec721652d91a2993311d6cf537d3724690be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs_2",
-        "utils": "utils"
-      }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/flake.nix
+++ b/flake.nix
@@ -1,83 +0,0 @@
-{
-  inputs = {
-    naersk.url = "github:nix-community/naersk/master";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, nixpkgs, utils, naersk }:
-    utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-        naersk-lib = pkgs.callPackage naersk { };
-      in
-      {
-        defaultPackage = naersk-lib.buildPackage ./.;
-        devShell = with pkgs; mkShell {
-          buildInputs = [ cargo rustc rustfmt pre-commit rustPackages.clippy ];
-          RUST_SRC_PATH = rustPlatform.rustLibSrc;
-        };
-
-        nixosModules.default = { config, lib, pkgs, ... }:
-          with lib;
-          let
-            cfg = config.services.paste-bin;
-          in
-          {
-            options.services.paste-bin = {
-              enable = mkEnableOption "paste-bin";
-              bindAddress = mkOption {
-                default = "[::]:8000";
-                description = "Address and port to listen on";
-                type = types.str;
-              };
-              maxPasteSize = mkOption {
-                default = 32768;
-                description = "Max allowed size of an individual paste";
-                type = types.int;
-              };
-              bufferSize = mkOption {
-                default = 1000;
-                description = "Maximum amount of pastes to store at a time";
-                type = types.int;
-              };
-            };
-
-            config = mkIf cfg.enable {
-              systemd.services.bin = {
-                enable = true;
-                wantedBy = [ "multi-user.target" ];
-                after = [ "network-online.target" ];
-                serviceConfig = {
-                  Type = "exec";
-                  ExecStart = "${self.defaultPackage."${system}"}/bin/bin --buffer-size ${toString cfg.bufferSize} --max-paste-size ${toString cfg.maxPasteSize} ${cfg.bindAddress}";
-                  Restart = "on-failure";
-
-                  CapabilityBoundingSet = "";
-                  NoNewPrivileges = true;
-                  PrivateDevices = true;
-                  PrivateTmp = true;
-                  PrivateUsers = true;
-                  PrivateMounts = true;
-                  ProtectHome = true;
-                  ProtectClock = true;
-                  ProtectProc = "noaccess";
-                  ProcSubset = "pid";
-                  ProtectKernelLogs = true;
-                  ProtectKernelModules = true;
-                  ProtectKernelTunables = true;
-                  ProtectControlGroups = true;
-                  ProtectHostname = true;
-                  RestrictSUIDSGID = true;
-                  RestrictRealtime = true;
-                  RestrictNamespaces = true;
-                  LockPersonality = true;
-                  RemoveIPC = true;
-                  RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
-                  SystemCallFilter = [ "@system-service" "~@privileged" ];
-                };
-              };
-            };
-          };
-      });
-}