November 2013 - tor-commits - lists.torproject.org

[flashproxy/master] return INSTALL to a site-local install, add openssl as a dependency
by infinity0＠torproject.org 21 Nov '13

21 Nov '13

commit 1b81dffa495776da606674a0b71ab4529ccd3f75 Author: Ximin Luo <infinity0(a)gmx.com> Date: Sat Sep 14 16:14:01 2013 +0100 return INSTALL to a site-local install, add openssl as a dependency --- facilitator/INSTALL | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/facilitator/INSTALL b/facilitator/INSTALL index 34004f4..37e55c2 100644 --- a/facilitator/INSTALL +++ b/facilitator/INSTALL @@ -1,27 +1,27 @@ Install the dependencies. - $ apt-get install python-m2crypto make + $ apt-get install make openssl python-m2crypto $ apt-get install gnulib # if running from git Configure and install. $ ./autogen.sh # if running from git or ./configure doesn't otherwise exist - $ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var && make + $ ./configure --localstatedir=/var/local && make # make pre-install install post-install This installs facilitator.cgi, facilitator, facilitator-email-poller, -facilitator-reg-daemon, facilitator-reg, and fac.py to /usr/bin. +facilitator-reg-daemon, facilitator-reg, and fac.py to /usr/local/bin. It also installs System V init files to /etc/init.d/. The pre/post-install scripts create a user for the daemon to as, and sets up the initscripts in the default system runlevels. -They also generate a RSA key in /etc/flashproxy/reg-daemon.{key,pub}. +They also generate a RSA key in /usr/local/etc/flashproxy/reg-daemon.{key,pub}. You will have to edit flashproxy-reg-email (in the client package) and copy the contents of reg-daemon.pub into the appropriate place. TODO(infinity0): find a better solution for this. -You should also edit /etc/flashproxy/reg-email.pass to contain your +You should also edit /usr/local/etc/flashproxy/reg-email.pass to contain your app-specific Gmail password; see doc/gmail-setup.txt for instructions. Uninstall.

1 0

[flashproxy/master] embed gmail password placeholder directly in Makefile to be less confusing
by infinity0＠torproject.org 21 Nov '13

21 Nov '13

commit 3f071c42cdc16fb6d7992d0d716dc38e9e345efe Author: Ximin Luo <infinity0(a)gmx.com> Date: Sat Sep 14 16:23:19 2013 +0100 embed gmail password placeholder directly in Makefile to be less confusing --- facilitator/INSTALL | 2 +- facilitator/Makefile.am | 8 ++++++-- facilitator/conf/reg-email.pass | 3 --- facilitator/doc/gmail-howto.txt | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/facilitator/INSTALL b/facilitator/INSTALL index 37e55c2..b7e80a3 100644 --- a/facilitator/INSTALL +++ b/facilitator/INSTALL @@ -22,7 +22,7 @@ copy the contents of reg-daemon.pub into the appropriate place. TODO(infinity0): find a better solution for this. You should also edit /usr/local/etc/flashproxy/reg-email.pass to contain your -app-specific Gmail password; see doc/gmail-setup.txt for instructions. +app-specific Gmail password; see doc/gmail-howto.txt for instructions. Uninstall. diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am index 5705e91..d28dc48 100644 --- a/facilitator/Makefile.am +++ b/facilitator/Makefile.am @@ -17,7 +17,7 @@ initscript_SCRIPTS = init.d/facilitator init.d/facilitator-email-poller init.d/f endif dist_doc_DATA = doc/appengine-howto.txt doc/facilitator-howto.txt doc/gmail-howto.txt README -dist_example_DATA = examples/fp-facilitator conf/reg-email.pass +dist_example_DATA = examples/fp-facilitator dist_appengine_DATA = appengine/app.yaml appengine/config.go appengine/fp-reg.go appengine/README appengineconf_DATA = appengine/config.go @@ -76,7 +76,11 @@ install-secrets: install -m 600 /dev/null $(pkgconfdir)/reg-daemon.key openssl genrsa 2048 | tee $(pkgconfdir)/reg-daemon.key | \ openssl rsa -pubout > $(pkgconfdir)/reg-daemon.pub - install -m 600 $(exampledir)/reg-email.pass $(pkgconfdir)/reg-email.pass + install -m 600 /dev/null $(pkgconfdir)/reg-email.pass + @echo >> $(pkgconfdir)/reg-email.pass \ + "Replace this file's contents with your Gmail app-specific password;" + @echo >> $(pkgconfdir)/reg-email.pass \ + "see gmail-howto.txt in this package's documentation for details." chown $(fpfacilitatoruser): $(pkgconfdir)/reg-daemon.key chown $(fpfacilitatoruser): $(pkgconfdir)/reg-email.pass diff --git a/facilitator/conf/reg-email.pass b/facilitator/conf/reg-email.pass deleted file mode 100644 index d1a58f7..0000000 --- a/facilitator/conf/reg-email.pass +++ /dev/null @@ -1,3 +0,0 @@ -Replace the contents of this file with your application-specific password for -your Gmail account - *not* your account password. You may see gmail-setup.txt in -this package's documentation for instructions on how to set this up. diff --git a/facilitator/doc/gmail-howto.txt b/facilitator/doc/gmail-howto.txt index b51ce90..f7c0598 100644 --- a/facilitator/doc/gmail-howto.txt +++ b/facilitator/doc/gmail-howto.txt @@ -57,5 +57,6 @@ https://www.google.com/accounts/SmsAuthConfig. Still on the 2-step summary page, click "Manage application-specific passwords". Enter "IMAP" for the name and click "Generate password". -Save the password to encrypted storage. This is the password that will -be used with the --pass option of facilitator-email-poller. +Save the password to encrypted storage. You should save this password +into /etc/flashproxy/reg-email.pass (or wherever you installed it), so +that facilitator-email-poller can pick it up.

1 0

[flashproxy/master] handle initscripts in a more robust way and provide an option not to install them
by infinity0＠torproject.org 21 Nov '13

21 Nov '13

commit 471a4bc234be1bf7e5f33142b1d1c1688ee50bbf Author: Ximin Luo <infinity0(a)gmx.com> Date: Sat Sep 14 15:59:51 2013 +0100 handle initscripts in a more robust way and provide an option not to install them --- facilitator/Makefile.am | 76 +++++++++++++++++++++++++++++----------------- facilitator/configure.ac | 8 +++++ 2 files changed, 56 insertions(+), 28 deletions(-) diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am index 44c0442..5705e91 100644 --- a/facilitator/Makefile.am +++ b/facilitator/Makefile.am @@ -1,7 +1,9 @@ # our own variables fpfacilitatoruser = @fpfacilitatoruser@ -initscriptdir = $(sysconfdir)/init.d +# unfortunately sysvinit does not support having initscripts in /usr/local/etc +# yet, so we have to hard code a path here. :( +initscriptdir = /etc/init.d exampledir = $(docdir)/examples appenginedir = $(pkgdatadir)/appengine pkgconfdir = $(sysconfdir)/flashproxy @@ -10,7 +12,9 @@ appengineconfdir = $(pkgconfdir)/reg-appengine # automake PLVs dist_bin_SCRIPTS = facilitator facilitator-email-poller facilitator-reg-daemon facilitator-reg facilitator.cgi fac.py +if DO_INITSCRIPTS initscript_SCRIPTS = init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon +endif dist_doc_DATA = doc/appengine-howto.txt doc/facilitator-howto.txt doc/gmail-howto.txt README dist_example_DATA = examples/fp-facilitator conf/reg-email.pass @@ -31,7 +35,16 @@ CLEANFILES = $(initscript_SCRIPTS) # root access and *must not be run* for fake/staged installs, e.g. when giving # non-standard directories to ./configure or DESTDIR to make. -pre-install: +pre-install: meta-install-sanity install-user +post-install: meta-install-sanity install-secrets install-symlinks install-daemon +pre-remove: meta-install-sanity remove-daemon remove-symlinks remove-secrets +post-remove: meta-install-sanity remove-user + +meta-install-sanity: + test "x$(DESTDIR)" = "x" || { echo >&2 \ + "don't run {pre,post}-{install,remove} when DESTDIR is set"; false; } + +install-user: id -u $(fpfacilitatoruser) >/dev/null 2>&1 || { \ which adduser >/dev/null 2>&1 && \ adduser --quiet \ @@ -49,7 +62,17 @@ pre-install: --shell /bin/false \ $(fpfacilitatoruser) ; } -post-install-secrets: +remove-user: + : # deluser does actually remove the group as well + id -u $(fpfacilitatoruser) >/dev/null 2>&1 && { \ + which deluser >/dev/null 2>&1 && \ + deluser --quiet \ + --system \ + $(fpfacilitatoruser) || \ + userdel \ + $(fpfacilitatoruser) ; } || true + +install-secrets: install -m 600 /dev/null $(pkgconfdir)/reg-daemon.key openssl genrsa 2048 | tee $(pkgconfdir)/reg-daemon.key | \ openssl rsa -pubout > $(pkgconfdir)/reg-daemon.pub @@ -57,42 +80,39 @@ post-install-secrets: chown $(fpfacilitatoruser): $(pkgconfdir)/reg-daemon.key chown $(fpfacilitatoruser): $(pkgconfdir)/reg-email.pass -post-install-symlinks: +remove-secrets: + rm -f $(pkgconfdir)/reg-* + +install-symlinks: for i in fp-reg.go app.yaml README; do \ $(LN_S) -f $(appenginedir)/$$i $(appengineconfdir)/$$i; \ done -post-install-daemon: +remove-symlinks: + rm -rf $(appengineconfdir) + +# initscripts: assume that if the user wanted to install them, then they also +# wanted to configure them, and that the system supports them. if this isn't the +# case then either (a) they are doing a staged install for another system and +# shouldn't be running {pre,post}-{install,remove} or (b) they shouldn't have +# told us to install initscripts for their system that doesn't support it. + +install-daemon: +if DO_INITSCRIPTS for i in facilitator facilitator-email-poller facilitator-reg-daemon; do \ update-rc.d $$i defaults; \ invoke-rc.d $$i start; \ done +endif -post-install: post-install-secrets post-install-symlinks post-install-daemon - -pre-remove-daemon: +remove-daemon: +if DO_INITSCRIPTS for i in facilitator facilitator-email-poller facilitator-reg-daemon; do \ invoke-rc.d $$i stop; \ + update-rc.d $$i remove; \ done - -pre-remove-symlinks: - rm -rf $(appengineconfdir) - -pre-remove-secrets: - rm -f $(pkgconfdir)/reg-* - -pre-remove: pre-remove-daemon pre-remove-symlinks pre-remove-secrets - -post-remove: - : # deluser does actually remove the group as well - id -u $(fpfacilitatoruser) >/dev/null 2>&1 && { \ - which deluser >/dev/null 2>&1 && \ - deluser --quiet \ - --system \ - $(fpfacilitatoruser) || \ - userdel \ - $(fpfacilitatoruser) ; } || true +endif .PHONY: pre-install post-install pre-remove post-remove -.PHONY: post-install-secrets post-install-symlinks post-install-daemon -.PHONY: pre-remove-daemon pre-remove-symlinks pre-remove-secrets +.PHONY: install-user install-secrets install-symlinks install-daemon +.PHONY: remove-user remove-secrets remove-symlinks remove-daemon diff --git a/facilitator/configure.ac b/facilitator/configure.ac index 386c20f..e6a100d 100644 --- a/facilitator/configure.ac +++ b/facilitator/configure.ac @@ -11,4 +11,12 @@ AC_CONFIG_FILES([Makefile init.d/facilitator-reg-daemon]) AC_PROG_LN_S +# check that we want to install initscripts. don't bother checking that they +# are supported, since we might be doing a staged install on a different system. +AC_ARG_ENABLE([initscripts], + [AS_HELP_STRING([--disable-initscripts], + [install and configure sysvinit-style initscripts (default yes)])], + [do_initscripts=], [do_initscripts=yes]) +AM_CONDITIONAL([DO_INITSCRIPTS], [test "x$do_initscripts" = xyes]) + AC_OUTPUT

1 0

[flashproxy/master] use GNU autotools to create an installable package, including docs
by infinity0＠torproject.org 21 Nov '13

21 Nov '13

commit 0080b8dff74c583682867eb190e49237fee3b9db Author: Ximin Luo <infinity0(a)gmx.com> Date: Thu Sep 12 17:03:08 2013 +0100 use GNU autotools to create an installable package, including docs --- Makefile | 5 +- facilitator/.gitignore | 27 +++++ facilitator/Makefile | 19 ---- facilitator/Makefile.am | 42 ++++++++ facilitator/autogen.sh | 2 + facilitator/conf/fp-facilitator | 27 +++++ facilitator/configure.ac | 13 +++ facilitator/doc/facilitator-howto.txt | 39 ++------ facilitator/init.d/facilitator | 122 ----------------------- facilitator/init.d/facilitator-email-poller | 119 ---------------------- facilitator/init.d/facilitator-email-poller.in | 121 +++++++++++++++++++++++ facilitator/init.d/facilitator-reg-daemon | 119 ---------------------- facilitator/init.d/facilitator-reg-daemon.in | 121 +++++++++++++++++++++++ facilitator/init.d/facilitator.in | 125 ++++++++++++++++++++++++ 14 files changed, 492 insertions(+), 409 deletions(-) diff --git a/Makefile b/Makefile index bf504af..8771405 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,10 @@ test: ./flashproxy-client-test test-full: test - cd facilitator && make test + cd facilitator && \ + { test -x ./config.status && ./config.status || \ + { test -x ./configure || ./autogen.sh; } && ./configure; } \ + && make && make check cd proxy && make test .PHONY: all install dist sign dist-exe clean clean-all test test-full diff --git a/facilitator/.gitignore b/facilitator/.gitignore new file mode 100644 index 0000000..7574515 --- /dev/null +++ b/facilitator/.gitignore @@ -0,0 +1,27 @@ +# files build by autogen.sh +/aclocal.m4 +/configure +/depcomp +/install-sh +/missing +/test-driver +/Makefile.in + +# files built by ./configure +/init.d/facilitator +/init.d/facilitator-email-poller +/init.d/facilitator-reg-daemon +/Makefile +/config.status +/config.log + +# files built by autoconf not meant for source-distribution +/autom4te.cache + +# files for binary-distribution +/flashproxy-facilitator-*.tar.* + +# files output by test-driver +/test-*.log +/*-test.log +/*-test.trs diff --git a/facilitator/Makefile b/facilitator/Makefile deleted file mode 100644 index 07ed125..0000000 --- a/facilitator/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -DESTDIR = -PREFIX = /usr/local -BINDIR = $(PREFIX)/bin - -all: - : - -install: - mkdir -p $(DESTDIR)$(BINDIR) - cp -f facilitator facilitator-email-poller facilitator-reg-daemon facilitator-reg facilitator.cgi fac.py $(DESTDIR)$(BINDIR) - cp -f init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon $(DESTDIR)/etc/init.d/ - -clean: - rm -f *.pyc - -test: - ./facilitator-test - -.PHONY: all install clean test diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am new file mode 100644 index 0000000..58e19b3 --- /dev/null +++ b/facilitator/Makefile.am @@ -0,0 +1,42 @@ +# our own variables + +fpfacilitatoruser = @fpfacilitatoruser@ +initscriptdir = $(sysconfdir)/init.d +exampledir = $(docdir)/examples + +# automake PLVs + +dist_bin_SCRIPTS = facilitator facilitator-email-poller facilitator-reg-daemon facilitator-reg facilitator.cgi fac.py +initscript_SCRIPTS = init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon + +dist_doc_DATA = doc/appengine-howto.txt doc/facilitator-howto.txt doc/gmail-howto.txt README +dist_example_DATA = conf/fp-facilitator + +dist_TESTS = facilitator-test + +# stuff built from AC_CONFIG_FILES +# see http://www.gnu.org/software/automake/manual/html_node/Scripts.html +CLEANFILES = $(initscript_SCRIPTS) + +# our own targets + +post-install: + which adduser >/dev/null 2>&1 && \ + adduser --quiet \ + --system \ + --disabled-password \ + --home $(sysconfdir)/flashproxy \ + --no-create-home \ + --shell /bin/false \ + --group \ + $(fpfacilitatoruser) || \ + useradd \ + --system \ + --home $(sysconfdir)/flashproxy \ + -M \ + --shell /bin/false \ + $(fpfacilitatoruser) + for i in facilitator facilitator-email-poller facilitator-reg-daemon; do \ + update-rc.d $$i defaults; \ + /etc/init.d/$$i start; \ + done diff --git a/facilitator/autogen.sh b/facilitator/autogen.sh new file mode 100755 index 0000000..4e7cc05 --- /dev/null +++ b/facilitator/autogen.sh @@ -0,0 +1,2 @@ +#!/bin/sh +autoreconf -if diff --git a/facilitator/conf/fp-facilitator b/facilitator/conf/fp-facilitator new file mode 100644 index 0000000..125d0cc --- /dev/null +++ b/facilitator/conf/fp-facilitator @@ -0,0 +1,27 @@ +# This is an example apache2 config for serving the facilitator. +# +# You can edit this file according to the instructions below, then copy it to +# /etc/apache2/sites-available/fp-facilitator, or wherever is appropriate. Then +# you can run `a2ensite fp-facilitator` to enable it. +# +<VirtualHost *:443> + # Update this with your hostname! + ServerName fp-facilitator.example.com + DocumentRoot /dev/null + # Make sure the path below matchs where you installed the facilitator. + ScriptAliasMatch ^(.*) /usr/bin/facilitator.cgi$1 + MaxClients 256 + + CustomLog ${APACHE_LOG_DIR}/fp-access.log common + ErrorLog ${APACHE_LOG_DIR}/fp-error.log + LogLevel warn + SSLEngine on + + # Manually install your certificate to the following location. + SSLCertificateFile /etc/apache2/fp-facilitator.pem + # If you got an intermediate certificate, uncomment the following line + # and install the certificate to that location too. + #SSLCertificateChainFile /etc/apache2/fp-intermediate.pem + + Header add Strict-Transport-Security "max-age=15768000" +</VirtualHost> diff --git a/facilitator/configure.ac b/facilitator/configure.ac new file mode 100644 index 0000000..3b74de5 --- /dev/null +++ b/facilitator/configure.ac @@ -0,0 +1,13 @@ +AC_PREREQ([2.69]) +AC_INIT([flashproxy-facilitator], [1.3]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign]) + +AC_ARG_VAR(fpfacilitatoruser, [the user/group for the facilitator to run as]) +fpfacilitatoruser="${fpfacilitatoruser:-flashproxy-fac}" + +AC_CONFIG_FILES([Makefile + init.d/facilitator + init.d/facilitator-email-poller + init.d/facilitator-reg-daemon]) + +AC_OUTPUT diff --git a/facilitator/doc/facilitator-howto.txt b/facilitator/doc/facilitator-howto.txt index a5cadb6..6283cf8 100644 --- a/facilitator/doc/facilitator-howto.txt +++ b/facilitator/doc/facilitator-howto.txt @@ -87,10 +87,6 @@ Restart servers. == Facilitator program installation -Create the user the daemons will run as. - - # useradd --shell /usr/sbin/nologin --system --home /nonexistent -M facilitator-nobody - Install the programs. # cd @@ -103,6 +99,13 @@ This installs facilitator.cgi, facilitator, facilitator-email-poller, facilitator-reg-daemon, facilitator-reg, and fac.py to /usr/local/bin. It also installs System V init files to /etc/init.d/. +Do post-installation tasks. + + # make postinst + +This creates a user for the daemons to run as, and sets up the init.d +scripts in the default system runlevels. + === Registration daemon setup The facilitator-reg-daemon program requires a private RSA key (used to @@ -119,13 +122,6 @@ reg-daemon.pub into the appropriate place. Install reg-daemon.key /etc/flashproxy to match what the init script expects. -=== Init script setup - - # update-rc.d facilitator defaults - # /etc/init.d/facilitator start - # update-rc.d facilitator-reg-daemon defaults - # /etc/init.d/facilitator-reg-daemon start - == HTTP server setup Apache is the web server that runs the CGI program. @@ -138,24 +134,9 @@ Edit /etc/apache2/ports.conf and comment out the port 80 configuration. # NameVirtualHost *:80 # Listen 80 -Create a new file /etc/apache2/sites-available/fp-facilitator with -these contents: - MaxClients 256 - <VirtualHost *:443> - ServerName fp-facilitator.example.com - DocumentRoot /dev/null - ScriptAliasMatch ^(.*) /usr/local/bin/facilitator.cgi$1 - CustomLog /dev/null common - ErrorLog ${APACHE_LOG_DIR}/error.log - LogLevel warn - SSLEngine on - SSLCertificateFile /etc/apache2/fp-facilitator.pem - SSLCertificateChainFile /etc/apache2/intermediate.pem - Header add Strict-Transport-Security "max-age=15768000" - </VirtualHost> -intermediate.pem is a possible intermediate certificate file provided by -the CA; if you did not get one, then leave off the -SSLCertificateChainFile line. +Edit conf/fp-facilitator as per the instructions given in that file, and +install it to /etc/apache2/sites-available/fp-facilitator or whatever is +appropriate for your apache2 installation. Link the configured site into sites-enabled. # a2ensite fp-facilitator diff --git a/facilitator/init.d/facilitator b/facilitator/init.d/facilitator deleted file mode 100755 index 19bb482..0000000 --- a/facilitator/init.d/facilitator +++ /dev/null @@ -1,122 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: facilitator -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Flash proxy facilitator -# Description: Debian init script for the flash proxy facilitator. -### END INIT INFO -# -# Author: David Fifield <david(a)bamsoftware.com> -# - -# Based on /etc/init.d/skeleton from Debian 6. - -# The relay must support the websocket pluggable transport. -# This is the IPv4 address of tor1.bamsoftware.com. -RELAY=173.255.221.44:9901 - -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin -DESC="Flash proxy facilitator" -NAME=facilitator -PIDFILE=/var/run/$NAME.pid -LOGFILE=/var/log/$NAME.log -PRIVDROP_USER=facilitator-nobody -DAEMON=/usr/local/bin/$NAME -DAEMON_ARGS="-r $RELAY --log $LOGFILE --pidfile $PIDFILE --privdrop-user $PRIVDROP_USER" -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -. /lib/init/vars.sh -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/facilitator/init.d/facilitator-email-poller b/facilitator/init.d/facilitator-email-poller deleted file mode 100755 index 2c9ecb8..0000000 --- a/facilitator/init.d/facilitator-email-poller +++ /dev/null @@ -1,119 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: facilitator-email-poller -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Flash proxy email rendezvous poller -# Description: Debian init script for the flash proxy email rendezvous poller. -### END INIT INFO -# -# Author: David Fifield <david(a)bamsoftware.com> -# - -# Based on /etc/init.d/skeleton from Debian 6. - -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin -DESC="Flash proxy email rendezvous poller" -NAME=facilitator-email-poller -PIDFILE=/var/run/$NAME.pid -LOGFILE=/var/log/$NAME.log -CONFDIR=/etc/flashproxy -PRIVDROP_USER=facilitator-nobody -DAEMON=/usr/local/bin/$NAME -DAEMON_ARGS="--pass $CONFDIR/reg-email.pass --log $LOGFILE --pidfile $PIDFILE --privdrop-user $PRIVDROP_USER" -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -. /lib/init/vars.sh -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/facilitator/init.d/facilitator-email-poller.in b/facilitator/init.d/facilitator-email-poller.in new file mode 100755 index 0000000..ef90794 --- /dev/null +++ b/facilitator/init.d/facilitator-email-poller.in @@ -0,0 +1,121 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: facilitator-email-poller +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Flash proxy email rendezvous poller +# Description: Debian init script for the flash proxy email rendezvous poller. +### END INIT INFO +# +# Author: David Fifield <david(a)bamsoftware.com> +# + +# Based on /etc/init.d/skeleton from Debian 6. + +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin +DESC="Flash proxy email rendezvous poller" +NAME=facilitator-email-poller + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +PIDFILE=@localstatedir@/run/$NAME.pid +LOGFILE=@localstatedir@/log/$NAME.log +CONFDIR=@sysconfdir@/flashproxy +PRIVDROP_USER=@fpfacilitatoruser@ +DAEMON=@bindir@/$NAME +DAEMON_ARGS="--pass $CONFDIR/reg-email.pass --log $LOGFILE --pidfile $PIDFILE --privdrop-user $PRIVDROP_USER" + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +. /lib/init/vars.sh +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + rm -f $PIDFILE + return "$RETVAL" +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/facilitator/init.d/facilitator-reg-daemon b/facilitator/init.d/facilitator-reg-daemon deleted file mode 100755 index e299468..0000000 --- a/facilitator/init.d/facilitator-reg-daemon +++ /dev/null @@ -1,119 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: facilitator-reg-daemon -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Flash proxy local registration daemon. -# Description: Debian init script for the flash proxy local registration daemon. -### END INIT INFO -# -# Author: David Fifield <david(a)bamsoftware.com> -# - -# Based on /etc/init.d/skeleton from Debian 6. - -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin -DESC="Flash proxy local registration daemon" -NAME=facilitator-reg-daemon -PIDFILE=/var/run/$NAME.pid -LOGFILE=/var/log/$NAME.log -CONFDIR=/etc/flashproxy -PRIVDROP_USER=facilitator-nobody -DAEMON=/usr/local/bin/$NAME -DAEMON_ARGS="--key $CONFDIR/reg-daemon.key --log $LOGFILE --pidfile $PIDFILE --privdrop-user $PRIVDROP_USER" -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -. /lib/init/vars.sh -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - rm -f $PIDFILE - return "$RETVAL" -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/facilitator/init.d/facilitator-reg-daemon.in b/facilitator/init.d/facilitator-reg-daemon.in new file mode 100755 index 0000000..5126baa --- /dev/null +++ b/facilitator/init.d/facilitator-reg-daemon.in @@ -0,0 +1,121 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: facilitator-reg-daemon +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Flash proxy local registration daemon. +# Description: Debian init script for the flash proxy local registration daemon. +### END INIT INFO +# +# Author: David Fifield <david(a)bamsoftware.com> +# + +# Based on /etc/init.d/skeleton from Debian 6. + +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin +DESC="Flash proxy local registration daemon" +NAME=facilitator-reg-daemon + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +PIDFILE=@localstatedir@/run/$NAME.pid +LOGFILE=@localstatedir@/log/$NAME.log +CONFDIR=@sysconfdir@/flashproxy +PRIVDROP_USER=@fpfacilitatoruser@ +DAEMON=@bindir@/$NAME +DAEMON_ARGS="--key $CONFDIR/reg-daemon.key --log $LOGFILE --pidfile $PIDFILE --privdrop-user $PRIVDROP_USER" + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +. /lib/init/vars.sh +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + rm -f $PIDFILE + return "$RETVAL" +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/facilitator/init.d/facilitator.in b/facilitator/init.d/facilitator.in new file mode 100755 index 0000000..53c27b4 --- /dev/null +++ b/facilitator/init.d/facilitator.in @@ -0,0 +1,125 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: facilitator +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Flash proxy facilitator +# Description: Debian init script for the flash proxy facilitator. +### END INIT INFO +# +# Author: David Fifield <david(a)bamsoftware.com> +# + +# Based on /etc/init.d/skeleton from Debian 6. + +# The relay must support the websocket pluggable transport. +# This is the IPv4 address of tor1.bamsoftware.com. +RELAY=173.255.221.44:9901 + +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin +DESC="Flash proxy facilitator" +NAME=facilitator + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +PIDFILE=@localstatedir@/run/$NAME.pid +LOGFILE=@localstatedir@/log/$NAME.log +CONFDIR=@sysconfdir@/flashproxy +PRIVDROP_USER=@fpfacilitatoruser@ +DAEMON=@bindir@/$NAME +DAEMON_ARGS="-r $RELAY --log $LOGFILE --pidfile $PIDFILE --privdrop-user $PRIVDROP_USER" + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +. /lib/init/vars.sh +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + rm -f $PIDFILE + return "$RETVAL" +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +:

1 0

[flashproxy/master] install the appengine files as data files in $(pkgdatadir)
by infinity0＠torproject.org 21 Nov '13

21 Nov '13

commit aafd15b8927e0d7519152d3e88f655b571037f04 Author: Ximin Luo <infinity0(a)gmx.com> Date: Fri Sep 13 14:05:52 2013 +0100 install the appengine files as data files in $(pkgdatadir) --- facilitator/Makefile.am | 2 ++ facilitator/appengine/README | 4 ++-- facilitator/appengine/app.yaml | 3 ++- facilitator/appengine/config.go | 5 +++++ facilitator/appengine/fp-reg.go | 7 ++++--- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am index b0df18f..200053a 100644 --- a/facilitator/Makefile.am +++ b/facilitator/Makefile.am @@ -3,6 +3,7 @@ fpfacilitatoruser = @fpfacilitatoruser@ initscriptdir = $(sysconfdir)/init.d exampledir = $(docdir)/examples +appenginedir = $(pkgdatadir)/appengine # automake PLVs @@ -11,6 +12,7 @@ initscript_SCRIPTS = init.d/facilitator init.d/facilitator-email-poller init.d/f dist_doc_DATA = doc/appengine-howto.txt doc/facilitator-howto.txt doc/gmail-howto.txt README dist_example_DATA = conf/fp-facilitator +dist_appengine_DATA = appengine/app.yaml appengine/config.go appengine/fp-reg.go appengine/README dist_TESTS = facilitator-test diff --git a/facilitator/appengine/README b/facilitator/appengine/README index 00d0611..2e1e33d 100644 --- a/facilitator/appengine/README +++ b/facilitator/appengine/README @@ -4,8 +4,8 @@ This is the server-side code that runs on Google App Engine for the See doc/appengine-howto.txt for information about setting up an application. -To run with the development server: +To run locally using the development server: $ ~/google_appengine/dev_appserver.py appengine/ To upload a new version: -$ torify ~/google_appengine/appcfg.py update appengine/ +$ torify ~/google_appengine/appcfg.py -A $YOUR_APP_ID update appengine/ diff --git a/facilitator/appengine/app.yaml b/facilitator/appengine/app.yaml index 3b99ada..7269664 100644 --- a/facilitator/appengine/app.yaml +++ b/facilitator/appengine/app.yaml @@ -1,4 +1,5 @@ -application: fp-reg-a +# override this with appcfg.py -A $YOUR_APP_ID +application: facilitator-registration-example version: 1 runtime: go api_version: go1 diff --git a/facilitator/appengine/config.go b/facilitator/appengine/config.go new file mode 100644 index 0000000..17098b5 --- /dev/null +++ b/facilitator/appengine/config.go @@ -0,0 +1,5 @@ +package fp_reg + +// host[:port] of the facilitator you want to register with +// for example, fp-facilitator.org +const FP_FACILITATOR = "" diff --git a/facilitator/appengine/fp-reg.go b/facilitator/appengine/fp-reg.go index d4f84c2..44e9528 100644 --- a/facilitator/appengine/fp-reg.go +++ b/facilitator/appengine/fp-reg.go @@ -10,8 +10,6 @@ import ( "appengine/urlfetch" ) -const BASE = "https://fp-facilitator.org/reg/" - func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain; charset=utf-8") w.Write([]byte("User-agent: *\nDisallow:\n")) @@ -33,7 +31,7 @@ func regHandler(w http.ResponseWriter, r *http.Request) { return } client := urlfetch.Client(appengine.NewContext(r)) - resp, err := client.Get(BASE + blob) + resp, err := client.Get("https://" + FP_FACILITATOR + "/reg/" + blob) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return @@ -51,4 +49,7 @@ func init() { http.HandleFunc("/robots.txt", robotsTxtHandler) http.HandleFunc("/ip", ipHandler) http.HandleFunc("/reg/", regHandler) + if FP_FACILITATOR == "" { + panic("FP_FACILITATOR empty; did you forget to edit config.go?") + } }

1 0

[flashproxy/master] populate /etc/flashproxy during post-install, including generating keys
by infinity0＠torproject.org 21 Nov '13

21 Nov '13

commit fef2e2abed21c0a7238e7824d3e733eb379244cb Author: Ximin Luo <infinity0(a)gmx.com> Date: Fri Sep 13 15:09:13 2013 +0100 populate /etc/flashproxy during post-install, including generating keys --- facilitator/INSTALL | 8 +++++++ facilitator/Makefile.am | 38 +++++++++++++++++++++++++++++---- facilitator/conf/fp-facilitator | 27 ----------------------- facilitator/conf/reg-email.pass | 3 +++ facilitator/configure.ac | 1 + facilitator/doc/facilitator-howto.txt | 18 +--------------- facilitator/examples/fp-facilitator | 27 +++++++++++++++++++++++ 7 files changed, 74 insertions(+), 48 deletions(-) diff --git a/facilitator/INSTALL b/facilitator/INSTALL index b6e0882..34004f4 100644 --- a/facilitator/INSTALL +++ b/facilitator/INSTALL @@ -16,6 +16,14 @@ It also installs System V init files to /etc/init.d/. The pre/post-install scripts create a user for the daemon to as, and sets up the initscripts in the default system runlevels. +They also generate a RSA key in /etc/flashproxy/reg-daemon.{key,pub}. +You will have to edit flashproxy-reg-email (in the client package) and +copy the contents of reg-daemon.pub into the appropriate place. +TODO(infinity0): find a better solution for this. + +You should also edit /etc/flashproxy/reg-email.pass to contain your +app-specific Gmail password; see doc/gmail-setup.txt for instructions. + Uninstall. # make pre-remove uninstall post-remove diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am index 200053a..44c0442 100644 --- a/facilitator/Makefile.am +++ b/facilitator/Makefile.am @@ -4,6 +4,8 @@ fpfacilitatoruser = @fpfacilitatoruser@ initscriptdir = $(sysconfdir)/init.d exampledir = $(docdir)/examples appenginedir = $(pkgdatadir)/appengine +pkgconfdir = $(sysconfdir)/flashproxy +appengineconfdir = $(pkgconfdir)/reg-appengine # automake PLVs @@ -11,8 +13,9 @@ dist_bin_SCRIPTS = facilitator facilitator-email-poller facilitator-reg-daemon f initscript_SCRIPTS = init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon dist_doc_DATA = doc/appengine-howto.txt doc/facilitator-howto.txt doc/gmail-howto.txt README -dist_example_DATA = conf/fp-facilitator +dist_example_DATA = examples/fp-facilitator conf/reg-email.pass dist_appengine_DATA = appengine/app.yaml appengine/config.go appengine/fp-reg.go appengine/README +appengineconf_DATA = appengine/config.go dist_TESTS = facilitator-test @@ -33,6 +36,7 @@ pre-install: which adduser >/dev/null 2>&1 && \ adduser --quiet \ --system \ + --group \ --disabled-password \ --home $(sysconfdir)/flashproxy \ --no-create-home \ @@ -45,24 +49,50 @@ pre-install: --shell /bin/false \ $(fpfacilitatoruser) ; } -post-install: +post-install-secrets: + install -m 600 /dev/null $(pkgconfdir)/reg-daemon.key + openssl genrsa 2048 | tee $(pkgconfdir)/reg-daemon.key | \ + openssl rsa -pubout > $(pkgconfdir)/reg-daemon.pub + install -m 600 $(exampledir)/reg-email.pass $(pkgconfdir)/reg-email.pass + chown $(fpfacilitatoruser): $(pkgconfdir)/reg-daemon.key + chown $(fpfacilitatoruser): $(pkgconfdir)/reg-email.pass + +post-install-symlinks: + for i in fp-reg.go app.yaml README; do \ + $(LN_S) -f $(appenginedir)/$$i $(appengineconfdir)/$$i; \ + done + +post-install-daemon: for i in facilitator facilitator-email-poller facilitator-reg-daemon; do \ update-rc.d $$i defaults; \ invoke-rc.d $$i start; \ done -pre-remove: +post-install: post-install-secrets post-install-symlinks post-install-daemon + +pre-remove-daemon: for i in facilitator facilitator-email-poller facilitator-reg-daemon; do \ invoke-rc.d $$i stop; \ done +pre-remove-symlinks: + rm -rf $(appengineconfdir) + +pre-remove-secrets: + rm -f $(pkgconfdir)/reg-* + +pre-remove: pre-remove-daemon pre-remove-symlinks pre-remove-secrets + post-remove: + : # deluser does actually remove the group as well id -u $(fpfacilitatoruser) >/dev/null 2>&1 && { \ which deluser >/dev/null 2>&1 && \ deluser --quiet \ --system \ $(fpfacilitatoruser) || \ userdel \ - $(fpfacilitatoruser) ; } + $(fpfacilitatoruser) ; } || true .PHONY: pre-install post-install pre-remove post-remove +.PHONY: post-install-secrets post-install-symlinks post-install-daemon +.PHONY: pre-remove-daemon pre-remove-symlinks pre-remove-secrets diff --git a/facilitator/conf/fp-facilitator b/facilitator/conf/fp-facilitator deleted file mode 100644 index 125d0cc..0000000 --- a/facilitator/conf/fp-facilitator +++ /dev/null @@ -1,27 +0,0 @@ -# This is an example apache2 config for serving the facilitator. -# -# You can edit this file according to the instructions below, then copy it to -# /etc/apache2/sites-available/fp-facilitator, or wherever is appropriate. Then -# you can run `a2ensite fp-facilitator` to enable it. -# -<VirtualHost *:443> - # Update this with your hostname! - ServerName fp-facilitator.example.com - DocumentRoot /dev/null - # Make sure the path below matchs where you installed the facilitator. - ScriptAliasMatch ^(.*) /usr/bin/facilitator.cgi$1 - MaxClients 256 - - CustomLog ${APACHE_LOG_DIR}/fp-access.log common - ErrorLog ${APACHE_LOG_DIR}/fp-error.log - LogLevel warn - SSLEngine on - - # Manually install your certificate to the following location. - SSLCertificateFile /etc/apache2/fp-facilitator.pem - # If you got an intermediate certificate, uncomment the following line - # and install the certificate to that location too. - #SSLCertificateChainFile /etc/apache2/fp-intermediate.pem - - Header add Strict-Transport-Security "max-age=15768000" -</VirtualHost> diff --git a/facilitator/conf/reg-email.pass b/facilitator/conf/reg-email.pass new file mode 100644 index 0000000..d1a58f7 --- /dev/null +++ b/facilitator/conf/reg-email.pass @@ -0,0 +1,3 @@ +Replace the contents of this file with your application-specific password for +your Gmail account - *not* your account password. You may see gmail-setup.txt in +this package's documentation for instructions on how to set this up. diff --git a/facilitator/configure.ac b/facilitator/configure.ac index 3b74de5..386c20f 100644 --- a/facilitator/configure.ac +++ b/facilitator/configure.ac @@ -10,4 +10,5 @@ AC_CONFIG_FILES([Makefile init.d/facilitator-email-poller init.d/facilitator-reg-daemon]) +AC_PROG_LN_S AC_OUTPUT diff --git a/facilitator/doc/facilitator-howto.txt b/facilitator/doc/facilitator-howto.txt index 6da8783..3a853ef 100644 --- a/facilitator/doc/facilitator-howto.txt +++ b/facilitator/doc/facilitator-howto.txt @@ -97,7 +97,7 @@ Edit /etc/apache2/ports.conf and comment out the port 80 configuration. # NameVirtualHost *:80 # Listen 80 -Edit conf/fp-facilitator as per the instructions given in that file, and +Edit examples/fp-facilitator as per the instructions given in that file, and install it to /etc/apache2/sites-available/fp-facilitator or whatever is appropriate for your apache2 installation. @@ -125,19 +125,3 @@ Copy the new fp-facilitator.pem to the facilitator server as /etc/apache2/fp-facilitator.pem. # /etc/init.d/apache2 restart - -=== Email poller setup - -The facilitator-email-poller program requires a password that is used to -log in to the designated Gmail account. See the file gmail-howto.txt for -instructions on setting up a Gmail account. After you've set up the -account and have the password, save it to a file reg-email.pass and make -it not readable or writable by anyone but its owner. - - # chmod 600 /etc/flashproxy/reg-email.pass - -Install reg-email.pass to /etc/flashproxy to match what the init script -expects. - - # update-rc.d facilitator-email-poller defaults - # /etc/init.d/facilitator-email-poller start diff --git a/facilitator/examples/fp-facilitator b/facilitator/examples/fp-facilitator new file mode 100644 index 0000000..125d0cc --- /dev/null +++ b/facilitator/examples/fp-facilitator @@ -0,0 +1,27 @@ +# This is an example apache2 config for serving the facilitator. +# +# You can edit this file according to the instructions below, then copy it to +# /etc/apache2/sites-available/fp-facilitator, or wherever is appropriate. Then +# you can run `a2ensite fp-facilitator` to enable it. +# +<VirtualHost *:443> + # Update this with your hostname! + ServerName fp-facilitator.example.com + DocumentRoot /dev/null + # Make sure the path below matchs where you installed the facilitator. + ScriptAliasMatch ^(.*) /usr/bin/facilitator.cgi$1 + MaxClients 256 + + CustomLog ${APACHE_LOG_DIR}/fp-access.log common + ErrorLog ${APACHE_LOG_DIR}/fp-error.log + LogLevel warn + SSLEngine on + + # Manually install your certificate to the following location. + SSLCertificateFile /etc/apache2/fp-facilitator.pem + # If you got an intermediate certificate, uncomment the following line + # and install the certificate to that location too. + #SSLCertificateChainFile /etc/apache2/fp-intermediate.pem + + Header add Strict-Transport-Security "max-age=15768000" +</VirtualHost>

1 0

[flashproxy/master] add reference install scripts and integrate them into the instructions
by infinity0＠torproject.org 21 Nov '13

21 Nov '13

commit fc251f7428f77fe51aee751cce031bb720acd961 Author: Ximin Luo <infinity0(a)gmx.com> Date: Thu Sep 12 17:03:20 2013 +0100 add reference install scripts and integrate them into the instructions --- facilitator/INSTALL | 21 +++++++++++++++++++ facilitator/Makefile.am | 32 ++++++++++++++++++++++++---- facilitator/README | 13 +++++++++--- facilitator/doc/facilitator-howto.txt | 37 --------------------------------- 4 files changed, 59 insertions(+), 44 deletions(-) diff --git a/facilitator/INSTALL b/facilitator/INSTALL new file mode 100644 index 0000000..b6e0882 --- /dev/null +++ b/facilitator/INSTALL @@ -0,0 +1,21 @@ +Install the dependencies. + + $ apt-get install python-m2crypto make + $ apt-get install gnulib # if running from git + +Configure and install. + + $ ./autogen.sh # if running from git or ./configure doesn't otherwise exist + $ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var && make + # make pre-install install post-install + +This installs facilitator.cgi, facilitator, facilitator-email-poller, +facilitator-reg-daemon, facilitator-reg, and fac.py to /usr/bin. +It also installs System V init files to /etc/init.d/. + +The pre/post-install scripts create a user for the daemon to as, and +sets up the initscripts in the default system runlevels. + +Uninstall. + + # make pre-remove uninstall post-remove diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am index 58e19b3..b0df18f 100644 --- a/facilitator/Makefile.am +++ b/facilitator/Makefile.am @@ -20,7 +20,14 @@ CLEANFILES = $(initscript_SCRIPTS) # our own targets -post-install: +# The {pre,post}-{install,remove} targets are just given as reference, and +# ought to be separate scripts as part of your distro's installation process. +# They are intentionally not linked to the install target since they require +# root access and *must not be run* for fake/staged installs, e.g. when giving +# non-standard directories to ./configure or DESTDIR to make. + +pre-install: + id -u $(fpfacilitatoruser) >/dev/null 2>&1 || { \ which adduser >/dev/null 2>&1 && \ adduser --quiet \ --system \ @@ -28,15 +35,32 @@ post-install: --home $(sysconfdir)/flashproxy \ --no-create-home \ --shell /bin/false \ - --group \ $(fpfacilitatoruser) || \ useradd \ --system \ --home $(sysconfdir)/flashproxy \ -M \ --shell /bin/false \ - $(fpfacilitatoruser) + $(fpfacilitatoruser) ; } + +post-install: for i in facilitator facilitator-email-poller facilitator-reg-daemon; do \ update-rc.d $$i defaults; \ - /etc/init.d/$$i start; \ + invoke-rc.d $$i start; \ done + +pre-remove: + for i in facilitator facilitator-email-poller facilitator-reg-daemon; do \ + invoke-rc.d $$i stop; \ + done + +post-remove: + id -u $(fpfacilitatoruser) >/dev/null 2>&1 && { \ + which deluser >/dev/null 2>&1 && \ + deluser --quiet \ + --system \ + $(fpfacilitatoruser) || \ + userdel \ + $(fpfacilitatoruser) ; } + +.PHONY: pre-install post-install pre-remove post-remove diff --git a/facilitator/README b/facilitator/README index 8c0ac29..81b44d5 100644 --- a/facilitator/README +++ b/facilitator/README @@ -1,3 +1,10 @@ -This directory contains files needed to run a flash proxy facilitator. -Normal users don't need any of these files. For instructions on setting -up a facilitator, see doc/facilitator-howto.txt. +This package contains files needed to run a flashproxy facilitator. +Normal users who just want to bypass censorship, should use the +flashproxy-client package instead. + +For instructions on building/installing this package from source, see +INSTALL. (This should only be necessary if your distro does not already +integrate this package into its repositories.) + +For instructions on setting up and running the facilitator, see +doc/facilitator-howto.txt. diff --git a/facilitator/doc/facilitator-howto.txt b/facilitator/doc/facilitator-howto.txt index 6283cf8..6da8783 100644 --- a/facilitator/doc/facilitator-howto.txt +++ b/facilitator/doc/facilitator-howto.txt @@ -85,43 +85,6 @@ Restart servers. # /etc/init.d/shorewall start # /etc/init.d/shorewall6 start -== Facilitator program installation - -Install the programs. - - # cd - # apt-get install git python-m2crypto make - # git clone https://git.torproject.org/flashproxy.git - # cd flashproxy/facilitator - # make install - -This installs facilitator.cgi, facilitator, facilitator-email-poller, -facilitator-reg-daemon, facilitator-reg, and fac.py to /usr/local/bin. -It also installs System V init files to /etc/init.d/. - -Do post-installation tasks. - - # make postinst - -This creates a user for the daemons to run as, and sets up the init.d -scripts in the default system runlevels. - -=== Registration daemon setup - -The facilitator-reg-daemon program requires a private RSA key (used to -decrypt encrypted client registrations). - - # mkdir /etc/flashproxy - # openssl genrsa -out /etc/flashproxy/reg-daemon.key 2048 - # chmod 600 /etc/flashproxy/reg-daemon.key - # openssl rsa -pubout < /etc/flashproxy/reg-daemon.key > reg-daemon.pub - -You will have to edit flashproxy-reg-email and copy the contents of -reg-daemon.pub into the appropriate place. - -Install reg-daemon.key /etc/flashproxy to match what the init script -expects. - == HTTP server setup Apache is the web server that runs the CGI program.

1 0

[flashproxy/master] separate child tests and link in future websocket-transport tests
by infinity0＠torproject.org 21 Nov '13

21 Nov '13

commit 55986435a04d7b547ebfe430915b69445211c588 Author: Ximin Luo <infinity0(a)gmx.com> Date: Wed Sep 11 17:51:24 2013 +0100 separate child tests and link in future websocket-transport tests --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 86176d5..bf504af 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,14 @@ clean: rm -f *.pyc rm -rf dist $(PY2EXE_TMPDIR) +clean-all: clean + rm -f doc/*.1 + test: ./flashproxy-client-test - cd facilitator && ./facilitator-test - cd proxy && ./flashproxy-test.js -.PHONY: all install dist sign dist-exe clean test +test-full: test + cd facilitator && make test + cd proxy && make test + +.PHONY: all install dist sign dist-exe clean clean-all test test-full

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 21 Nov '13

21 Nov '13

commit bd54e87bbc39b07071e7fa8996403345c889944d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 13:15:09 2013 +0000 Update translations for tsum --- gl/short-user-manual_gl_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gl/short-user-manual_gl_noimg.xhtml b/gl/short-user-manual_gl_noimg.xhtml index aeda790..3268f28 100644 --- a/gl/short-user-manual_gl_noimg.xhtml +++ b/gl/short-user-manual_gl_noimg.xhtml @@ -65,7 +65,7 @@ sub 2048R/EB399FD7 2003-10-16 Se a súa conexión a Internet funciona, e o Tor non pode conectarse á rede, probe o seguinte: Abra o panel de control do Vidalia, prema en Rexistro de Mensaxes e seleccione Avanzado. Pode ser que o Tor non se conecte porque: O reloxo do sistema está desactivado: Asegúrese de que a hora e data do seu sistema é correcta e reinicie Tor. Pode ser necesario sincronizar o reloxo do sistema con un servidor horario en Internet. Está detrás dun firewall restritivo: Para que Tor só use os portos 80 e 443, abra o panel de control do Vidalia, prema en Configuración e Rede e marque a caixa que di Meu firewall só me permite conectarse a determinados portos. - Your anti-virus program is blocking Tor: Make sure that your anti-virus program is not preventing Tor from making network connections. + Seu programa antivirus está bloqueado o Tor: Asegúrese de que o seu antivirus non está impedindo que o Tor faga conexións de rede. If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with Tor bridges, hidden relays that aren't as easy to block. If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file. <h3 id="how-to-find-a-bridge">How to find a bridge</h3>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 21 Nov '13

21 Nov '13

commit a28ecbfe00820a3a906f8cae2986f602a728eb78 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 10:45:09 2013 +0000 Update translations for tsum --- gl/short-user-manual_gl_noimg.xhtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gl/short-user-manual_gl_noimg.xhtml b/gl/short-user-manual_gl_noimg.xhtml index 0970dba..aeda790 100644 --- a/gl/short-user-manual_gl_noimg.xhtml +++ b/gl/short-user-manual_gl_noimg.xhtml @@ -62,9 +62,9 @@ sub 2048R/EB399FD7 2003-10-16 <h3 id="what-to-do-when-tor-does-not-connect">Que facer cando Tor non conecta</h3> Algúns usuarios van notar que Vidalia se atasca ao tentar conectarse á rede Tor. Se isto acontece, asegúrese de que está conectado a Internet. Se precisa conectarse a un servidor proxy, vexa a continuación Como usar un proxy aberto . - If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on Message Log and select the Advanced tab. It may be that Tor won't connect because: - Your system clock is off: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server. - You are behind a restrictive firewall: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on Settings and Network, and tick the box that says My firewall only lets me connect to certain ports. + Se a súa conexión a Internet funciona, e o Tor non pode conectarse á rede, probe o seguinte: Abra o panel de control do Vidalia, prema en Rexistro de Mensaxes e seleccione Avanzado. Pode ser que o Tor non se conecte porque: + O reloxo do sistema está desactivado: Asegúrese de que a hora e data do seu sistema é correcta e reinicie Tor. Pode ser necesario sincronizar o reloxo do sistema con un servidor horario en Internet. + Está detrás dun firewall restritivo: Para que Tor só use os portos 80 e 443, abra o panel de control do Vidalia, prema en Configuración e Rede e marque a caixa que di Meu firewall só me permite conectarse a determinados portos. Your anti-virus program is blocking Tor: Make sure that your anti-virus program is not preventing Tor from making network connections. If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with Tor bridges, hidden relays that aren't as easy to block. If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.

1 0