Update devcontainer.json and apply some patches

Switch to GenericWebAuth + redlib-org#509

Author: espacedev3019

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
     "name": "Rust",
-    "image": "mcr.microsoft.com/devcontainers/rust:1.0.9-bookworm",
+    "image": "mcr.microsoft.com/devcontainers/rust:latest",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {}
     },

Cargo.toml

@@ -51,7 +51,8 @@ arc-swap = "1.7.1"
 serde_json_path = "0.7.1"
 async-recursion = "1.1.1"
 pulldown-cmark = { version = "0.12.0", features = ["simd", "html"], default-features = false }
-hyper-rustls = { version = "0.24.2", features = [ "http2" ] }
+hyper-tls = { version = "0.5.0" }
+openssl = { version = "0.10", features = ["vendored"] }
 tegen = "0.1.4"
 serde_urlencoded = "0.7.1"
 chrono = { version = "0.4.39", default-features = false, features = [ "std" ] }

Dockerfile.alpine

@@ -1,12 +1,12 @@
 # supported versions here: https://hub.docker.com/_/rust
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.22
 
 ########################
 ## builder image
 ########################
 FROM rust:alpine${ALPINE_VERSION} AS builder
 
-RUN apk add --no-cache musl-dev
+RUN apk add --no-cache musl-dev perl make git
 
 WORKDIR /redlib
 
@@ -26,6 +26,9 @@ RUN echo "finished building redlib!"
 ########################
 FROM alpine:${ALPINE_VERSION} AS release
 
+# Install runtime dependencies for OpenSSL
+RUN apk add --no-cache ca-certificates
+
 # Import redlib binary from builder
 COPY --from=builder /redlib/target/release/redlib /usr/local/bin/redlib
 

Dockerfile.ubuntu

@@ -7,6 +7,8 @@ ARG UBUNTU_RELEASE_VERSION=noble
 ########################
 FROM rust:${RUST_BUILDER_VERSION} AS builder
 
+RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
+
 WORKDIR /redlib
 
 # download (most) dependencies in their own layer

src/client.rs

@@ -5,7 +5,8 @@ use futures_lite::{future::Boxed, FutureExt};
 use hyper::client::HttpConnector;
 use hyper::header::HeaderValue;
 use hyper::{body, body::Buf, header, Body, Client, Method, Request, Response, Uri};
-use hyper_rustls::{ConfigBuilderExt, HttpsConnector};
+//use hyper_rustls::{ConfigBuilderExt, HttpsConnector};
+use hyper_tls::HttpsConnector;
 use libflate::gzip;
 use log::{error, trace, warn};
 use percent_encoding::{percent_encode, CONTROLS};
@@ -30,6 +31,8 @@ const REDDIT_SHORT_URL_BASE_HOST: &str = "redd.it";
 const ALTERNATIVE_REDDIT_URL_BASE: &str = "https://www.reddit.com";
 const ALTERNATIVE_REDDIT_URL_BASE_HOST: &str = "www.reddit.com";
 
+pub static HTTPS_CONNECTOR: LazyLock<HttpsConnector<HttpConnector>> = LazyLock::new(HttpsConnector::new);
+/*
 pub static HTTPS_CONNECTOR: LazyLock<HttpsConnector<HttpConnector>> = LazyLock::new(|| {
 	hyper_rustls::HttpsConnectorBuilder::new()
 		.with_tls_config(
@@ -60,6 +63,7 @@ pub static HTTPS_CONNECTOR: LazyLock<HttpsConnector<HttpConnector>> = LazyLock::
 		.enable_http2()
 		.build()
 });
+*/
 
 pub static CLIENT: LazyLock<Client<HttpsConnector<HttpConnector>>> = LazyLock::new(|| Client::builder().build::<_, Body>(HTTPS_CONNECTOR.clone()));
 

src/oauth.rs

@@ -75,7 +75,8 @@ impl Oauth {
 	pub(crate) async fn new() -> Self {
 		// Try MobileSpoofAuth first, then fall back to GenericWebAuth
 		let mut failure_count = 0;
-		let mut backend = OauthBackendImpl::MobileSpoof(MobileSpoofAuth::new());
+		//let mut backend = OauthBackendImpl::MobileSpoof(MobileSpoofAuth::new());
+		let mut backend = OauthBackendImpl::GenericWeb(GenericWebAuth::new()); // Use generic web auth
 
 		loop {
 			let attempt = Self::new_with_timeout_with_backend(backend.clone()).await;