Skip to content

Commit

Permalink
Merge pull request #249 from GoSecure/fix-247
Browse files Browse the repository at this point in the history
fix: UTF-8 support for docker images.
  • Loading branch information
obilodeau authored Oct 16, 2020
2 parents 946fab4 + d575b6b commit 93ca836
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Handles compiling and package installation
FROM ubuntu:20.04 AS compile-image

# Install build dependencies
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand All @@ -15,7 +16,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libavformat-dev libavcodec-dev libavdevice-dev \
libavutil-dev libswscale-dev libswresample-dev libavfilter-dev


RUN python3 -m venv /opt/venv
# Make sure we use the virtualenv:
ENV PATH="/opt/venv/bin:$PATH"
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#
# Handles compiling and package installation
FROM ubuntu:20.04 AS compile-image

# Install build dependencies
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
6 changes: 5 additions & 1 deletion pyrdp/mitm/mitm.default.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# On Windows systems, the file should be in:
#
# %APPDATA%/pyrdp/mitm.ini
#
#
# On MacOS:
#
# ~/Library/Application Support/pyrdp/mitm.ini
Expand Down Expand Up @@ -126,25 +126,29 @@ class = logging.handlers.TimedRotatingFileHandler
filename = ${vars:output_dir}/${vars:log_dir}/mitm.log
when = D
formatter = default
encoding = utf8

# Outputs connections to mitm.json
[logs:handlers:connections]
class = logging.FileHandler
filename = ${vars:output_dir}/${vars:log_dir}/mitm.json
formatter = json
encoding = utf8


# Outputs to crawl.log
[logs:handlers:crawl_txt]
class = logging.FileHandler
filename = ${vars:output_dir}/${vars:log_dir}/crawl.log
formatter = compact
encoding = utf8

# Outputs to crawl.json
[logs:handlers:crawl_json]
class = logging.FileHandler
filename = ${vars:output_dir}/${vars:log_dir}/crawl.json
formatter = json
encoding = utf8

# Outputs SSL secrets
[logs:handlers:ssl]
Expand Down

0 comments on commit 93ca836

Please sign in to comment.