Adding v3 support to vanity address generation

.github/workflows/build-docker.yml

@@ -0,0 +1,33 @@
+name: Build docker image CI
+
+on:
+  push:
+    branches: master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64/v8
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/tor-hiddenservice-nginx:latest

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "mkp224o"]
+	path = mkp224o
+	url = https://github.com/cathugger/mkp224o.git

Dockerfile

@@ -1,26 +1,16 @@
-FROM debian:jessie
+FROM debian:bullseye
 
-LABEL maintainer "[email protected]"
+LABEL maintainer="[email protected]"
 
 # Base packages
 RUN apt-get update && \
-    apt-get -y install \
-    nginx \
-    tor torsocks ntpdate
-
-# Compile shallot
-ADD ./shallot /shallot
-RUN apt-get -y install \
-    build-essential \
-    libssl-dev && \
-    cd /shallot && \
-    ./configure && \
-    make && \
-    mv ./shallot /bin && \
-    cd / && \
-    rm -Rf /shallot && \
-    apt-get -y purge build-essential libssl-dev && \
-    rm -Rf /var/lib/apt/lists/*
+    apt-get -y install nginx tor torsocks ntpdate sudo \
+    gcc libsodium-dev make autoconf
+
+ADD ./mkp224o /mkp224o
+ADD ./main.sh /main.sh
+ADD ./torrc /etc/tor/torrc
+ADD ./nginx.conf /etc/nginx/nginx.conf
 
 # Security and permissions
 RUN useradd --system --uid 666 -M --shell /usr/sbin/nologin hidden
@@ -29,19 +19,12 @@ RUN useradd --system --uid 666 -M --shell /usr/sbin/nologin hidden
 RUN ln --symbolic --force /dev/stdout /var/log/nginx/access.log
 RUN ln --symbolic --force /dev/stderr /var/log/nginx/error.log
 
-# Main script
-ADD ./main.sh /main.sh
-
-# Tor Config
-ADD ./torrc /etc/tor/torrc
-
-# Add nginx default configuration 
-ADD ./nginx.conf /etc/nginx/nginx.conf
-
 # Configuration files and data output folder
 VOLUME /web
 WORKDIR /web
 
+EXPOSE 9050
+
 ENTRYPOINT ["/main.sh"]
 CMD ["serve"]
 

README.md

@@ -1,44 +1,41 @@
 # Easily create and run hidden services 
-[![Docker Pulls](https://img.shields.io/docker/pulls/strm/tor-hiddenservice-nginx.svg?style=plastic)](https://hub.docker.com/r/strm/tor-hiddenservice-nginx/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/ozeliurs/tor-hiddenservice-nginx.svg?style=plastic)](https://hub.docker.com/r/ozeliurs/tor-hiddenservice-nginx/)
 ![License](https://img.shields.io/badge/License-GPL-blue.svg?style=plastic)
 
+This is a fork of opsxcq's project. This docker image now supports tor v3
+adresses and shallot has been replaced by mkp224o (v3 compatible).
+Feel free to open issues on this project if you see something wrong.
 
 Easily run a hidden service inside the Tor network with this container
 
-
 Generate the skeleton configuration for you hidden service, replace <pattern>
 for your hidden service pattern name. Example, if you want to your hidden
-service contain the word 'boss', just use this word as argument. You can use
-regular expressions, like ```^boss```, will generate an address wich will start
-with 'boss'. Be aware that bigger the pattern, more time it will take to
-generate it.
+service contain the word 'boss', just use this word as argument. Be aware that 
+bigger the pattern, more time it will take to generate it.
 
 ```sh
-docker run -it --rm -v $(pwd)/web:/web \
-       strm/tor-hiddenservice-nginx generate <pattern>
+docker run -it --rm -v $(pwd)/web:/web ozeliurs/tor-hiddenservice-nginx generate <pattern>
 ```
 
-
 Create an container named 'hiddensite' to serve your generated hidden service
 
 ```sh
-docker run -d --restart=always --name hiddensite -v $(pwd)/web:/web \
-       strm/tor-hiddenservice-nginx 
+docker run -d --restart=always --name hiddensite -v $(pwd)/web:/web ozeliurs/tor-hiddenservice-nginx 
 ```
 
 ## Example
 
 Let's create a hidden service with the name beginning with strm.
 
 ```sh
-docker pull strm/tor-hiddenservice-nginx
+docker pull ozeliurs/tor-hiddenservice-nginx
 ```
 
 Wait to the container image be downloaded. And them we can generate our site
 skeleton:
 
 ```sh
-$docker run -it --rm -v $(pwd)/web:/web strm/tor-hiddenservice-nginx generate ^strm
+$docker run -it --rm -v $(pwd)/web:/web ozeliurs/tor-hiddenservice-nginx generate strm
 [+] Generating the address with mask: ^strm
 [+] Found matching domain after 137072 tries: strmfyygjp5st54g.onion
 [+] Generating nginx configuration for site  strmfyygjp5st54g.onion
@@ -49,8 +46,7 @@ $docker run -it --rm -v $(pwd)/web:/web strm/tor-hiddenservice-nginx generate ^s
 Now we have our skeleton generated, we can run the container with:
 
 ```sh
-docker run -d --restart=always --name hiddensite \
-       -v $(pwd)/web:/web strm/tor-hiddenservice-nginx
+docker run -d --restart=always --name hiddensite -v $(pwd)/web:/web ozeliurs/tor-hiddenservice-nginx
 ```
 
 And you have the service running ! :)
@@ -67,69 +63,20 @@ And you have the service running ! :)
 
 # FAQ
 
-## Anti-Pattern
-
-While is not a good thing to run everything in one container, this is a easy way
-to get started if you don't have that much experience with docker and hidden
-services. If you want to use something more elaborated, check this
-[repository](https://github.com/opsxcq/docker-tor).
-
-Here is an example of how a deploy using this other image looks like.
-
-```yml
-version: '3'
-
-services:
-  tor:
-    image: strm/tor
-    restart: always
-    depends_on:
-      - backend
-    environment:
-        LISTEN_PORT: "80"
-        REDIRECT: "backend:80"
-        PRIVATE_KEY: |
-          -----BEGIN RSA PRIVATE KEY-----
-          MIICXQIBAAKBgQDSqBzjGxL+UFdrFJSdc+LJn3RrXiaZ7k6kgSw8KqOCSRgIr2qO
-          XZrCa3YHE+PqsfbDVF0GO0Xy3A9fsIxRFMUo3K++3BaVJslUbqK2TH9fJt5Ji1b6
-          N5UzXsEzf73atXwMF63hgVFZFLhfSWH8jGE1svwDXn0YQWP88PVX34SrWQIDASsd
-          AoGAUWdd+/m9TrTQyqK0IbzIr0fYQ5gDq4mv1GLEYjR4SWF8pSCxL1yOBsmQ02sj
-          BSS2Vw4dpFfloCrRw2ipM8ac4kdLGCoYefQHwW2Kfdf9raVfPDP7vcxrs37sOgOh
-          2rSXCOOrmcoMrEka2/OTGW15jaNUEEoWacS3YL1Fj0Bi6g0CQQD4ZmBiF6qu2XnT
-          8lMr1Asdz3K8fYiyfl6CzHItUubAbQ8ipv12q8CerJqk3dO98V+w8llAsQ7BT5wq
-          8AZOPQR3AkEA2RobnACDvb2Jw+dYSFsqrHyIDojKsrNiDEFedkiFijRFqme+nrif
-          kJ4yTnSiphC+rSSBbvYMawsqiWBA7UPSrwJBAKXSVQClxNUpJ2PZt91HZAtuipRt
-          t8suGIY4mot1iDRN0XdiNN8TNZ3qLag7wUU4or+Yn/3Xae1euHpyftTxmYsCQQCd
-          oJxsGotYx62ULxPqz0um7yEWOU6hUAy8MB3X3FcTCjGO0PPKpfJ2ntXo0Ajcp5ci
-          msi81/e9DTnF9mPjtsY9AkAUG6heBlETMFzyka9FHPgu9aN2kRwvJ3QZDHuPxYG4
-          VZwljLxstlx57+N74D0aj6wrJw+iBH2BI+b+ZpnLXyy7
-          -----END RSA PRIVATE KEY-----
-```
-
-To make it work you should also add a webserver with the name `backend`, and add
-your content there. There are more moving pieces using a deploy like this, so
-this is the justification for this repository, for people who never put anything
-on the deep web being able to enjoy it without busting their asses debugging
-some infrastructure.
-
-
-## Build
+## Build Docker image
 
 ```
-docker build -t strm/tor-hiddenservice-nginx .
+docker build -t ozeliurs/tor-hiddenservice-nginx .
 ```
 
-## Run
+## Run Docker container
 
 ```
-docker run -d --restart=always --name hiddensite \
-       -v $(pwd)/web:/web strm/tor-hiddenservice-nginx 
+docker run -d --restart=always --name hiddensite -v $(pwd)/web:/web ozeliurs/tor-hiddenservice-nginx 
 
 ```
 ## Shell
 
 ```
-docker run -it --rm -v $(pwd)/web:/web \
-       --entrypoint /bin/bash strm/tor-hiddenservice-nginx
-
+docker run -it --rm -v $(pwd)/web:/web --entrypoint /bin/bash ozeliurs/tor-hiddenservice-nginx
 ```

main.sh

@@ -12,13 +12,27 @@ then
         echo '[-] You dont provided any mask, please inform an mask to generate your address'
         exit -1
     else
+        echo "[+] Building mkp224o"
+        cd /mkp224o
+        ./autogen.sh
+        ./configure
+        make
+        mv ./mkp224o /bin
+        cd /
+        rm -Rf /mkp224o
+        apt-get -y purge gcc libsodium-dev make autoconf
+        rm -Rf /var/lib/apt/lists/*
+
         echo '[+] Generating the address with mask: '$2
-        shallot -f /tmp/key $2
-        echo '[+] '$(grep Found /tmp/key)
-        grep 'BEGIN RSA' -A 99 /tmp/key > /web/private_key
+        rm -rf /tmp/keys && mkdir /tmp/keys
+
+        mkp224o $2 -n 1 -d /tmp/keys &> /dev/null
+        echo '[+] Found '$(cat /tmp/keys/*.onion/hostname)
+        cp /tmp/keys/*.onion/*secret_key /web/
+        cp /tmp/keys/*.onion/hostname /web/
     fi
 
-    address=$(grep Found /tmp/key | cut -d ':' -f 2 )
+    address=$(cat /tmp/keys/*.onion/hostname)
 
     echo '[+] Generating nginx configuration for site '$address
     echo 'server {' > /web/site.conf
@@ -30,26 +44,27 @@ then
 
     echo '[+] Creating www folder'
     mkdir /web/www
-    chmod 755 /web/
-    chmod 755 /web/www
+    chmod 700 /web/
+    chmod 700 /web/www
     echo '[+] Generating index.html template'
     echo '<html><head><title>Your very own hidden service is ready</title></head><body><h1>Well done !</h1></body></html>' > /web/www/index.html
-    chown hidden:hidden -R /web/www
+    chown hidden:hidden -R /web/
 fi
 
 if [ "$1" == "serve" ]
 then
-    if [ ! -f /web/private_key ]
+    if [ ! -f /web/*secret_key ]
     then
         echo '[-] Please run this container with generate argument to initialize your web page'
         exit -1
     fi
     echo '[+] Initializing local clock'
     ntpdate -B -q 0.debian.pool.ntp.org
     echo '[+] Starting tor'
-    tor -f /etc/tor/torrc &
+    sudo -u hidden tor -f /etc/tor/torrc &
     echo '[+] Starting nginx'
     nginx &
+
     # Monitor logs
     sleep infinity
 fi