mirror
/
socks-to-http-proxy
mirror of https://github.com/KaranGauswami/socks-to-http-proxy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

removed anyhow and and support some flags

pull/8/head
KaranGauswami 3 years ago
parent
18babcd021
commit
50ee3dcddf
No known key found for this signature in database GPG Key ID: 521E5CB2B400CA51
4 changed files with 132 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 107
      Cargo.lock
  2. 10
      Cargo.toml
  3. 21
      LICENSE
  4. 37
      src/main.rs

107
Cargo.lock
View File

@ -2,6 +2,21 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 3
[[package]]
name = "addr2line"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
dependencies = [
"gimli",
]
[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.18" version = "0.7.18"
@ -11,12 +26,6 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "anyhow"
version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
[[package]] [[package]]
name = "async-socks5" name = "async-socks5"
version = "0.5.1" version = "0.5.1"
@ -56,6 +65,21 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
version = "0.3.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61"
dependencies = [
"addr2line",
"cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
]
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.3.2" version = "1.3.2"
@ -119,6 +143,19 @@ dependencies = [
"os_str_bytes", "os_str_bytes",
] ]
[[package]]
name = "color-eyre"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f1885697ee8a177096d42f158922251a41973117f6d8a234cee94b9509157b7"
dependencies = [
"backtrace",
"eyre",
"indenter",
"once_cell",
"owo-colors",
]
[[package]] [[package]]
name = "core-foundation" name = "core-foundation"
version = "0.9.3" version = "0.9.3"
@ -154,6 +191,16 @@ dependencies = [
"termcolor", "termcolor",
] ]
[[package]]
name = "eyre"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
dependencies = [
"indenter",
"once_cell",
]
[[package]] [[package]]
name = "fastrand" name = "fastrand"
version = "1.7.0" version = "1.7.0"
@ -273,6 +320,12 @@ dependencies = [
"slab", "slab",
] ]
[[package]]
name = "gimli"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.12.1" version = "0.12.1"
@ -385,6 +438,12 @@ dependencies = [
"tokio-native-tls", "tokio-native-tls",
] ]
[[package]]
name = "indenter"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "1.9.0" version = "1.9.0"
@ -437,6 +496,15 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "miniz_oxide"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
dependencies = [
"adler",
]
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.3" version = "0.8.3"
@ -477,6 +545,15 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "object"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.12.0" version = "1.12.0"
@ -534,6 +611,12 @@ version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
[[package]]
name = "owo-colors"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2386b4ebe91c2f7f51082d4cefa145d030e33a1842a96b12e4885cc3c01f7a55"
[[package]] [[package]]
name = "pin-project-lite" name = "pin-project-lite"
version = "0.2.9" version = "0.2.9"
@ -629,6 +712,12 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "rustc-demangle"
version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
[[package]] [[package]]
name = "schannel" name = "schannel"
version = "0.1.20" version = "0.1.20"
@ -682,8 +771,8 @@ dependencies = [
name = "sthp" name = "sthp"
version = "0.2.0" version = "0.2.0"
dependencies = [ dependencies = [
"anyhow",
"clap", "clap",
"color-eyre",
"env_logger", "env_logger",
"futures-util", "futures-util",
"http", "http",
@ -813,9 +902,9 @@ dependencies = [
[[package]] [[package]]
name = "tower-service" name = "tower-service"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]] [[package]]
name = "tracing" name = "tracing"

10
Cargo.toml
View File

@ -1,19 +1,23 @@
[package] [package]
name = "sthp" name = "sthp"
version = "0.2.0" version = "0.2.0"
license = "MIT"
authors = ["Karan Gauswami <[email protected]>"] authors = ["Karan Gauswami <[email protected]>"]
edition = "2021" edition = "2021"
categories = ["command-line-utilities"]
description = "Convert Socks5 proxy into Http proxy"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
color-eyre = { version = "0.5", default-features = false }
futures-util = "0.3" futures-util = "0.3"
http = "0.2" http = "0.2"
hyper = { version = "0.14", features = ["http1", "server", "tcp", "client"] } hyper = { version = "0.14", features = ["http1", "server", "tcp", "client"] }
clap = { version = "3.2", features = ["derive"] } clap = { version = "3", features = ["derive"] }
tokio-socks = "0.5" tokio-socks = "0.5"
tokio = { version = "1.19 ", features = ["macros", "rt-multi-thread"] } tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
anyhow = "1.0"
hyper-socks2 = { version = "0.6" } hyper-socks2 = { version = "0.6" }
log = "0.4" log = "0.4"
env_logger = "0.9" env_logger = "0.9"

21
LICENSE
View File

@ -1,21 +0,0 @@
MIT License
Copyright (c) 2020 Karan Gauswami
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

37
src/main.rs
View File

@ -1,5 +1,5 @@
use anyhow::Result; use clap::{ErrorKind, IntoApp, Parser};
use clap::Parser; use color_eyre::eyre::Result;
use http::Uri; use http::Uri;
use hyper::client::HttpConnector; use hyper::client::HttpConnector;
use hyper::service::{make_service_fn, service_fn}; use hyper::service::{make_service_fn, service_fn};
@ -8,17 +8,20 @@ use hyper::{Body, Request, Response, Server};
use hyper_socks2::{Auth, SocksConnector}; use hyper_socks2::{Auth, SocksConnector};
use log::debug; use log::debug;
use std::convert::Infallible; use std::convert::Infallible;
use std::net::SocketAddr; use std::net::{Ipv4Addr, SocketAddr};
use tokio_socks::tcp::Socks5Stream; use tokio_socks::tcp::Socks5Stream;
use tokio_socks::{IntoTargetAddr, ToProxyAddrs}; use tokio_socks::{IntoTargetAddr, ToProxyAddrs};
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
#[clap(name = "sthp", about = "Convert Socks5 proxy into Http proxy")] #[clap(author, version, about,long_about=None)]
struct Cli { struct Cli {
#[clap(short, long, default_value = "8080")]
/// port where Http proxy should listen /// port where Http proxy should listen
#[clap(short, long, default_value = "8080",value_parser = clap::value_parser!(u16).range(1..))]
port: u16, port: u16,
#[clap(long, default_value = "0.0.0.0")]
listen_ip: Ipv4Addr,
/// Socks5 proxy address /// Socks5 proxy address
#[clap(short, long, default_value = "127.0.0.1:1080")] #[clap(short, long, default_value = "127.0.0.1:1080")]
socks_address: SocketAddr, socks_address: SocketAddr,
@ -35,6 +38,7 @@ struct Cli {
#[tokio::main] #[tokio::main]
async fn main() -> Result<()> { async fn main() -> Result<()> {
env_logger::init(); env_logger::init();
color_eyre::install()?;
let args = Cli::parse(); let args = Cli::parse();
let socks_address = args.socks_address; let socks_address = args.socks_address;
@ -42,13 +46,26 @@ async fn main() -> Result<()> {
let username = args.username; let username = args.username;
let password = args.password; let password = args.password;
let auth = if let (Some(username), Some(password)) = (username, password) { let mut cmd = Cli::command();
Some(Auth::new(username, password))
} else { let auth = match (username, password) {
None (Some(username), Some(password)) => Some(Auth::new(username, password)),
(Some(_), None) => cmd
.error(
ErrorKind::ArgumentNotFound,
"--password is required if --username is used",
)
.exit(),
(None, Some(_)) => cmd
.error(
ErrorKind::ArgumentNotFound,
"--username is required if --password is used",
)
.exit(),
(None, None) => None,
}; };
let auth = &*Box::leak(Box::new(auth)); let auth = &*Box::leak(Box::new(auth));
let addr = SocketAddr::from(([0, 0, 0, 0], port)); let addr = SocketAddr::from((args.listen_ip, port));
let make_service = make_service_fn(move |_| async move { let make_service = make_service_fn(move |_| async move {
Ok::<_, Infallible>(service_fn(move |req| proxy(req, socks_address, auth))) Ok::<_, Infallible>(service_fn(move |req| proxy(req, socks_address, auth)))
}); });

Write Preview
Loading…
Cancel
Save