Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pyproxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""

from pyproxy.server import ProxyServer
from pyproxy.utils.args import parse_args, load_config, get_config_value
from pyproxy.utils.args import parse_args, load_config, get_config_value, str_to_bool
from pyproxy.utils.config import ProxyConfigLogger, ProxyConfigFilter, ProxyConfigSSL

# pylint: disable=C0301,R0914
Expand Down Expand Up @@ -33,19 +33,19 @@ def main():
logger_config = ProxyConfigLogger(
access_log=get_config_value(args, config, 'access_log', 'Logging', "logs/access.log"),
block_log=get_config_value(args, config, 'block_log', 'Logging', "logs/block.log"),
no_logging_access=get_config_value(args, config, 'no_logging_access', 'Logging', False),
no_logging_block=get_config_value(args, config, 'no_logging_block', 'Logging', False)
no_logging_access=str_to_bool(get_config_value(args, config, 'no_logging_access', 'Logging', False)),
no_logging_block=str_to_bool(get_config_value(args, config, 'no_logging_block', 'Logging', False))
)

filter_config = ProxyConfigFilter(
no_filter=get_config_value(args, config, 'no_filter', 'Filtering', False),
no_filter=str_to_bool(get_config_value(args, config, 'no_filter', 'Filtering', False)),
filter_mode=get_config_value(args, config, 'filter_mode', 'Filtering', "local"),
blocked_sites=get_config_value(args, config, 'blocked_sites', 'Filtering', "config/blocked_sites.txt"),
blocked_url=get_config_value(args, config, 'blocked_url', 'Filtering', "config/blocked_url.txt")
)

ssl_config = ProxyConfigSSL(
ssl_inspect=get_config_value(args, config, 'ssl_inspect', 'Security', False),
ssl_inspect=str_to_bool(get_config_value(args, config, 'ssl_inspect', 'Security', False)),
inspect_ca_cert=get_config_value(args, config, 'inspect_ca_cert', 'Security', "certs/ca/cert.pem"),
inspect_ca_key=get_config_value(args, config, 'inspect_ca_key', 'Security', "certs/ca/key.pem"),
inspect_certs_folder=get_config_value(args, config, 'inspect_certs_folder', 'Security', "certs/"),
Expand All @@ -55,7 +55,7 @@ def main():
proxy = ProxyServer(
host=host,
port=port,
debug=debug,
debug=str_to_bool(debug),
logger_config=logger_config,
filter_config=filter_config,
ssl_config=ssl_config,
Expand All @@ -65,7 +65,7 @@ def main():
shortcuts=shortcuts,
custom_header=custom_header,
authorized_ips=authorized_ips,
proxy_enable=proxy_enable,
proxy_enable=str_to_bool(proxy_enable),
proxy_host=proxy_host,
proxy_port=proxy_port
)
Expand Down
3 changes: 2 additions & 1 deletion pyproxy/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ class ProxyServer:
"shortcuts_proc", "shortcuts_queue", "shortcuts_result_queue",
"cancel_inspect_proc", "cancel_inspect_queue", "cancel_inspect_result_queue",
"custom_header_proc", "custom_header_queue", "custom_header_result_queue",
"console_logger", "access_logger", "block_logger",
"console_logger", "access_logger", "block_logger", "authorized_ips",
"active_connections"
}

def __init__(self, host, port, debug, logger_config, filter_config,
Expand Down
12 changes: 12 additions & 0 deletions pyproxy/utils/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,15 @@ def get_config_value(args: argparse.Namespace, config: configparser.ConfigParser
return env_value

return config.get(section, arg_name, fallback=fallback_value)

def str_to_bool(value: str) -> bool:
"""
Converts a string representation of truth to a boolean value.

Args:
value (str): The value to convert (e.g., "true", "1", "yes").

Returns:
bool: True if the string represents a true value, False otherwise.
"""
return str(value).lower() in ("yes", "true", "t", "1")