[Python-modules-commits] [parallelpython] 05/09: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Mon Apr 25 18:41:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository parallelpython.
commit 279dbd341426903b99d8eb6ddb6f3e8a22880509
Merge: 331ecb9 f3f32b7
Author: Sandro Tosi <morph at debian.org>
Date: Mon Apr 25 19:28:02 2016 +0100
merge patched into master
CHANGELOG | 3 +++
PKG-INFO | 6 +++---
debian/.git-dpm | 6 +++---
debian/patches/10_remove_default_password.patch | 6 +++---
debian/patches/20_hyphen-used-as-minus-sign.patch | 2 +-
pp.py | 7 ++++---
ppauto.py | 2 +-
ppcommon.py | 2 +-
ppserver.py | 2 +-
pptransport.py | 2 +-
ppworker.py | 2 +-
11 files changed, 22 insertions(+), 18 deletions(-)
diff --cc debian/.git-dpm
index a62ae13,0000000..94e25ae
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 29799861768e412e53b4b6eb2a52f5daeaf2f797
- 29799861768e412e53b4b6eb2a52f5daeaf2f797
- e81c3de0fe9232dc944caf1042cb700c983751d4
++f3f32b707c3a0bb6d8c34c06b235fb42198f3fd9
++f3f32b707c3a0bb6d8c34c06b235fb42198f3fd9
++f30674dc836307d7bab169da7be9134fc762cd54
+f30674dc836307d7bab169da7be9134fc762cd54
+parallelpython_1.6.5.orig.tar.gz
+c77dc0202cacd41963f225e058dff7673301202b
+30751
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/10_remove_default_password.patch
index b41dacc,0000000..7fd4182
mode 100644,000000..100644
--- a/debian/patches/10_remove_default_password.patch
+++ b/debian/patches/10_remove_default_password.patch
@@@ -1,69 -1,0 +1,69 @@@
- From 770a5bdb1b7784f76363b2187819254b8d2800ae Mon Sep 17 00:00:00 2001
++From b20bbe5917008a5588f6109b66a6becaf090c3d9 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Thu, 8 Oct 2015 10:06:03 -0700
+Subject: This patch removes the default password from pp code, requiring users
+ to
+
+explicitly write one; it updates the documentation along the source code
+Patch-Name: 10_remove_default_password.patch
+---
+ doc/ppdoc.html | 12 +++++-------
+ pp.py | 8 +++-----
+ 2 files changed, 8 insertions(+), 12 deletions(-)
+
+diff --git a/doc/ppdoc.html b/doc/ppdoc.html
+index c210f70..8ecfb8f 100644
+--- a/doc/ppdoc.html
++++ b/doc/ppdoc.html
+@@ -158,13 +158,11 @@ to the number of processors in the system
+ and list of ppservers to connect with :</p><p><strong> job_server = pp.Server(</strong><strong>ppservers=</strong><strong>ppservers</strong><strong>) </strong></p><p>5) Submit all the tasks for parallel execution:</p><p><strong> f1 = job_server.submit(func1, args1, depfuncs1, modules1)</strong></p><p><strong> f2 = job_server.submit(func1, args2, depfuncs1, modules1) </strong></p><p><strong> f3 = job_server.su [...]
+ Start pp execution server with the number of workers set
+ to the number of processors in the system,
+- <br>list of ppservers to connect with and secret key to authorize the connection:</p><p><strong> job_server = pp.Server(</strong><strong>ppservers=</strong><strong>ppservers</strong><strong>, secret="</strong><strong>mysecret</strong><strong>") </strong></p><p>5) Submit all the tasks for parallel execution:</p><p><strong> f1 = job_server.submit(func1, args1, depfuncs1, modules1)</strong></p><p><strong> f2 = job_server.submit(f [...]
+- to the security concerns it is highly recommended to run ppserver.py
+-with an non-trivial secret key (-s command line argument) which should
+-be paired with the matching <em>secret</em> keyword of PP Server class constructor. Since PP 1.5.3 it is possible to set secret key by assigning <strong>pp_secret</strong> variable in the configuration file <strong>.pythonrc.py</strong>
+- which should be located in the user home directory (please make this
+-file readable and writable only by user). The key set in .pythonrc.py
+-could be overridden by command line argument (for ppserver.py) and <em>secret</em> keyword (for PP Server class constructor). </p><p> </p><hr><h1 id="COMMANDLINE"> ppserver.py stats and PID file example<br></h1><p>To print job execution statistics for ppserver.py send a SIGUSR1 signal to its main process.<br>For instance on UNIX platform following commands will start a server and print its stats:<br><strong>ppserver.py -P /tmp/ppserver.pid </strong></p><p><strong>kill [...]
++ <br>list of ppservers to connect with and secret key to authorize the connection:</p><p><strong> job_server = pp.Server(</strong><strong>ppservers=</strong><strong>ppservers</strong><strong>, secret="</strong><strong>mysecret</strong><strong>") </strong></p><p>5) Submit all the tasks for parallel execution:</p><p><strong> f1 = job_server.submit(func1, args1, depfuncs1, modules1)</strong></p><p><strong> f2 = job_server.submit(f [...]
++
++<a name="SECURITY" title="SECURITY"></a></h1><p> Due to the security concerns, in Debian we decided to disable default password authentication, and require to run <strong>ppserver</strong> with a non-trivial secret key (<strong>-s</strong> command line argument) which should be paired with the matching <em>secret</em> keyword of PP Server class constructor. An alternative way to set a secret key is by assigning <strong>pp_secret</strong> variable in the configuration file <strong>. [...]
++
++<p> </p><hr><h1 id="COMMANDLINE"> ppserver.py stats and PID file example<br></h1><p>To print job execution statistics for ppserver.py send a SIGUSR1 signal to its main process.<br>For instance on UNIX platform following commands will start a server and print its stats:<br><strong>ppserver.py -P /tmp/ppserver.pid </strong></p><p><strong>kill -s SIGUSR1 `cat /tmp/ppserver.pid`</strong><br></p>
+
+ </td>
+ </tr>
+diff --git a/pp.py b/pp.py
- index 9d9a930..3355255 100644
++index 936c68d..e3f4023 100644
+--- a/pp.py
++++ b/pp.py
+@@ -275,7 +275,6 @@ class Server(object):
+ """
+
+ default_port = 60000
+- default_secret = "epo20pdosl;dksldkmm"
+
+ def __init__(self, ncpus="autodetect", ppservers=(), secret=None,
+ restart=False, proto=2, socket_timeout=3600):
+@@ -286,9 +285,8 @@ class Server(object):
+ the number of processors in the system
+ ppservers - list of active parallel python execution servers
+ to connect with
+- secret - passphrase for network connections, if omitted a default
+- passphrase will be used. It's highly recommended to use a
+- custom passphrase for all network connections.
++ secret - passphrase for network connections; it can be set via
++ command-line or configuration file
+ restart - whether to restart worker process after each task completion
+ proto - protocol number for pickle module
+ socket_timeout - socket timeout in seconds which is also the maximum
- @@ -370,7 +368,7 @@ class Server(object):
++@@ -371,7 +369,7 @@ class Server(object):
+ raise TypeError("secret must be of a string type")
+ self.secret = str(secret)
+ else:
+- self.secret = Server.default_secret
++ raise ValueError("secret must be set using command-line option or configuration file")
+ self.__connect()
+ self.__creation_time = time.time()
+ self.logger.info("pp local server started with %d workers"
diff --cc debian/patches/20_hyphen-used-as-minus-sign.patch
index f8ce5d9,0000000..0d10249
mode 100644,000000..100644
--- a/debian/patches/20_hyphen-used-as-minus-sign.patch
+++ b/debian/patches/20_hyphen-used-as-minus-sign.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 29799861768e412e53b4b6eb2a52f5daeaf2f797 Mon Sep 17 00:00:00 2001
++From f3f32b707c3a0bb6d8c34c06b235fb42198f3fd9 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Thu, 8 Oct 2015 10:06:04 -0700
+Subject: escape minus sign where needed
+
+Patch-Name: 20_hyphen-used-as-minus-sign.patch
+---
+ doc/ppserver.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/ppserver.1 b/doc/ppserver.1
+index f376964..ed0aea0 100644
+--- a/doc/ppserver.1
++++ b/doc/ppserver.1
+@@ -58,7 +58,7 @@ Please visit http://www.parallelpython.com for extended up\-to\-date
+ documentation, examples and support forums
+ .br
+ .SH SECURITY
+-Due to the security concerns it is highly recommended to run ppserver.py with an non-trivial secret key (-s command line argument) which should be paired with the matching secret keyword of PP Server class constructor. An alternative way to set a secret key is by assigning
++Due to the security concerns it is highly recommended to run ppserver.py with an non-trivial secret key (\-s command line argument) which should be paired with the matching secret keyword of PP Server class constructor. An alternative way to set a secret key is by assigning
+ .B pp_secret
+ variable in the configuration file
+ .B .pythonrc.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/parallelpython.git
More information about the Python-modules-commits
mailing list