Compare commits

..

8 Commits

Author SHA1 Message Date
Fabian Peter Hammerle 31a69d9d90 release v4.5.0 2021-09-06 14:49:37 +02:00
Fabian Peter Hammerle b26c721e60 added ability to select exit nodes explicitly via EXIT_NODES env var 2021-09-05 16:22:00 +02:00
dependabot[bot] fc3f461cdd build(deps): bump alpine from 3.14.1 to 3.14.2
Bumps alpine from 3.14.1 to 3.14.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-03 08:01:52 +00:00
dependabot[bot] 4bdd61e3b2 build(deps): bump docker/build-push-action from 2.6.1 to 2.7.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.6.1 to 2.7.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2.6.1...v2.7.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-27 08:05:44 +00:00
Fabian Peter Hammerle 5a9d489a1d upgrade tor package from v0.4.5.9-r0 to v0.4.5.10-r0 (see links below)
https://gitweb.torproject.org/tor.git/plain/ChangeLog
https://git.alpinelinux.org/aports/commit/community/tor?id=b2aec05acfa2bf2a191f41f24ed213f883e648e9
2021-08-21 19:51:45 +02:00
dependabot[bot] db1f87c85c build(deps): bump alpine from 3.14.0 to 3.14.1
Bumps alpine from 3.14.0 to 3.14.1.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-13 08:02:55 +00:00
dependabot[bot] 0cf3a5f284 build(deps): bump docker/setup-buildx-action from 1.5.0 to 1.5.1
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1.5.0...v1.5.1)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-16 08:06:36 +00:00
dependabot[bot] 2cb4dfeb05 build(deps): bump docker/setup-buildx-action from 1.4.1 to 1.5.0
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1.4.1...v1.5.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-09 08:03:58 +00:00
8 changed files with 28 additions and 6 deletions
+2 -2
View File
@@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: docker/setup-qemu-action@v1.2.0
- uses: docker/setup-buildx-action@v1.4.1
- uses: docker/setup-buildx-action@v1.5.1
# > By default, this action uses the Git context so you don't need to use
# > the actions/checkout action to checkout the repository because this
# > will be done directly by buildkit. [...]
# > any file mutation in the steps that precede [...] will be ignored
# https://github.com/marketplace/actions/build-and-push-docker-images
- uses: docker/build-push-action@v2.6.1
- uses: docker/build-push-action@v2.7.0
with:
platforms: |
linux/amd64
+6 -1
View File
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [4.5.0] - 2021-09-06
### Added
- added ability to select exit nodes explicitly via `EXIT_NODES` environment variable
## [4.4.0] - 2021-07-07
### Added
- added ability to exclude exit nodes via `EXCLUDE_EXIT_NODES` environment variable
@@ -83,7 +87,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- tor socks5 & DNS proxy
[Unreleased]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.4.0...HEAD
[Unreleased]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.5.0...HEAD
[4.5.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.4.0...v4.5.0
[4.4.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.3.1...v4.4.0
[4.3.1]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.3.0...v4.3.1
[4.3.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.2.0...v4.3.0
+5 -3
View File
@@ -1,7 +1,7 @@
FROM docker.io/alpine:3.14.0
FROM docker.io/alpine:3.14.2
# nftables + dependencies add 2.3MB to image
ARG TOR_PACKAGE_VERSION=0.4.5.9-r0
ARG TOR_PACKAGE_VERSION=0.4.5.10-r0
ARG NFTABLES_PACKAGE_VERSION=0.9.9-r0
RUN apk add --no-cache \
nftables=$NFTABLES_PACKAGE_VERSION \
@@ -19,7 +19,9 @@ EXPOSE 9050/tcp
EXPOSE 9053/udp
COPY torrc.template entrypoint.sh /
RUN chmod -c a+rX /torrc.template /entrypoint.sh
ENV SOCKS_TIMEOUT_SECONDS=
ENV SOCKS_TIMEOUT_SECONDS= \
EXIT_NODES= \
EXCLUDE_EXIT_NODES=
ENTRYPOINT ["/entrypoint.sh"]
# entrypoint.sh drops privileges after configuring nftables for transparent proxy
+6
View File
@@ -48,6 +48,12 @@ sudo iptables -A OUTPUT ! -o lo -j REJECT --reject-with icmp-admin-prohibited
$ sudo docker run -e SOCKS_TIMEOUT_SECONDS=60
```
### Select Exit Nodes
```sh
$ sudo docker run -e EXIT_NODES=1.2.3.4,1.2.3.5,{at}
```
### Exclude Exit Nodes
```sh
+1
View File
@@ -9,6 +9,7 @@ services:
image: fphammerle/tor-proxy
environment:
SOCKS_TIMEOUT_SECONDS: 30
#EXIT_NODES: '1.2.3.4,1.2.3.5,{at}'
#EXCLUDE_EXIT_NODES: '{xx},{yy},1.2.3.4,128.0.0.0/1'
volumes:
- type: volume
+5
View File
@@ -20,6 +20,11 @@ else
sed -e "s/{socks_timeout_seconds}/$SOCKS_TIMEOUT_SECONDS/" /torrc.template > /tmp/torrc
fi
if [ -z "$EXIT_NODES" ]; then
sed --in-place -e '/{exit_nodes}/d' /tmp/torrc
else
sed --in-place -e "s#{exit_nodes}#$EXIT_NODES#" /tmp/torrc
fi
if [ -z "$EXCLUDE_EXIT_NODES" ]; then
sed --in-place -e '/{exclude_exit_nodes}/d' /tmp/torrc
else
+1
View File
@@ -0,0 +1 @@
https://git.alpinelinux.org/aports/log/community/tor
+2
View File
@@ -26,6 +26,8 @@ SocksTimeout {socks_timeout_seconds}
# https://github.com/mitmproxy/mitmproxy/blob/v6.0.2/mitmproxy/platform/linux.py#L27
TransPort 0.0.0.0:9040 IsolateClientAddr IsolateClientProtocol
# > list of identity fingerprints, country codes, and address patterns
ExitNodes {exit_nodes}
ExcludeExitNodes {exclude_exit_nodes}
# try to