Commit a4cb54ea authored by juga's avatar juga
Browse files

Merge pull request 'delays' (#12) from juga/pEpPythonMixnet:delays into master

parents ff3f0c06 e0e531b9

.gitlab-ci.yml

+4 −1
Original line number Diff line number Diff line
@@ -48,17 +48,20 @@ test_mixnet: 
    - apk add --no-cache py-pip gcc libffi-dev openssl-dev libc-dev make python3-dev

    - pip install docker-compose

    - docker-compose up -d

    - docker exec alice client -d -p EB85BB5FA33A75E15E944E63F231550C4F47E38E -f /tests/data/plain_from_alice_to_bob.eml

    - docker exec alice client -n -d -p EB85BB5FA33A75E15E944E63F231550C4F47E38E -f /tests/data/plain_from_alice_to_bob.eml

    - docker exec alice cat /root/log/mixnet.log

    - docker exec alice cat /var/log/mail.log

    # The Email might take some seconds to arrive to the other containers.

    - sleep 3

    - docker exec n1 cat /home/remailer/log/mixnet.log

    - docker exec n1 cat /var/log/mail.log

    - sleep 3

    - docker exec n2 cat /home/remailer/log/mixnet.log

    - docker exec n2 cat /var/log/mail.log

    - sleep 3

    - docker exec n3 cat /home/remailer/log/mixnet.log

    - docker exec n3 cat /var/log/mail.log

    - sleep 3

    - docker exec bob cat /var/mail/root

    - docker exec bob test /var/mail/root

    - echo "Congratulations, Bob has received the encrypted Email from Alice."

Dockerfile

+6 −2
Original line number Diff line number Diff line 
FROM registry.gitlab.com/juga0/peppythonadapter_git/sync-docker:latest as mixnet

# XXX: This should be removed in the Dockerfiles used to build the images

RUN rm -rf sequoia; rm -rf /usr/local/cargo; rm -rf /usr/local/rustup; \

  rm -rf /root/.cargo \

  rm -rf build*; rm *.py *.sh *.cc *.hh *.o *.txt *.md \

  rm -rf /root/.cargo; \

  rm -rf build*; rm *.py *.sh *.cc *.hh *.o *.txt *.md; \

  rm -rf /libetpan /asn1c /.git /asn.1 /yml2

# Some of these dependencies are still needed.

# RUN apt purge -y gcc build-essential automake libgpgme-dev libsqlite3-dev \
@@ -34,6 +34,10 @@ ENV TRANSPORT=${TRANSPORT} 
# The user that will run postfix pipe

RUN if [ "$USER" != "root" ] ; then adduser --system ${USER}; fi

RUN if [ -n "$KEY" ]; then sudo -u ${USER} gpg --import ${KEY}; fi

# XXX: Remove part of this in the other Dockerfiles

RUN rm -rf /libpEpAdapter* /doc /sync /db \

  /Makefile* Adapter* local.conf /README* /mixnet* /pEp* /postfix \

  /py* /setup* /src /test /tox* /utils

# To be able to se domain and port at runtime

ENTRYPOINT ["docker/configure_postfix.sh"]

CMD ["docker/start_postfix.sh"]

docker/configure_postfix.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ postconf -F 'smtp/inet/service='$PORT 
# to run the transport.

# In the case that Postfix runs in a different port than 25, pass it to the

# transport too.

postconf -M remailer/unix='remailer unix - n n - - pipe user='$USER' argv=/usr/local/bin/remailer -p '$MYFP #'-t localhost:'$PORT

postconf -M remailer/unix='remailer unix - n n - - pipe user='$USER' argv=/usr/local/bin/remailer -n -p '$MYFP #'-t localhost:'$PORT



# Add transport and virtual files

echo $DOMAIN'        remailer:' > /etc/postfix/transport

docs/source/mixnet.rst

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ mixnet.exceptions module 
   :undoc-members:

   :show-inheritance:



mixnet.settings module

----------------------



.. automodule:: mixnet.settings

   :members:

   :undoc-members:

   :show-inheritance:





Module contents

---------------

docs/source/modules.rst

+2 −2
Original line number Diff line number Diff line 
mixnet API

==========

mixnet

======



.. toctree::

   :maxdepth: 4