You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/03/26 17:28:20 UTC
[1/2] git commit: Fixed intermittently failing tests
Repository: allura
Updated Branches:
refs/heads/cj/7287 [created] 61c766c81
Fixed intermittently failing tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/158d2e77
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/158d2e77
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/158d2e77
Branch: refs/heads/cj/7287
Commit: 158d2e7723a24c9f8de0f76d4efef39170b8685e
Parents: f970d43
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Mon Mar 24 21:45:50 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Mon Mar 24 21:45:50 2014 +0000
----------------------------------------------------------------------
Allura/allura/tests/functional/test_admin.py | 4 ++--
Allura/allura/tests/functional/test_home.py | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/158d2e77/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 49246a8..3df40fa 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -24,7 +24,7 @@ from contextlib import contextmanager
import tg
import PIL
-from nose.tools import assert_equals, assert_in, assert_not_in
+from nose.tools import assert_equals, assert_in, assert_not_in, assert_greater_equal
from ming.orm.ormsession import ThreadLocalORMSession
from tg import expose
from pylons import tmpl_context as c, app_globals as g
@@ -321,7 +321,7 @@ class TestProjectAdmin(TestController):
def test_tool_paging(self):
r = self.app.get('/admin/tools')
- assert_equals(2, len(r.html.findAll('ul', {'class': 'deck'})))
+ assert_greater_equal(2, len(r.html.findAll('ul', {'class': 'deck'})))
r = self.app.get('/admin/tools?limit=1&page=0')
assert_equals(1, len(r.html.findAll('ul', {'class': 'deck'})))
r = self.app.get('/admin/tools?limit=1&page=1')
http://git-wip-us.apache.org/repos/asf/allura/blob/158d2e77/Allura/allura/tests/functional/test_home.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py
index 8a8d087..58f1d61 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -83,9 +83,10 @@ class TestProjectHome(TestController):
c.app = p.install_app('wiki', tool_name, tool_name, i)
response = self.app.get('/p/test/_nav.json')
menu = response.json['menu']
- assert_equal(len(menu[0]['children']), 10)
+ wiki_menu = [m for m in menu if m['tool_name'] == 'wiki'][0]
+ assert_equal(len(wiki_menu['children']), 10)
assert {u'url': u'/p/test/_list/wiki', u'name': u'More...',
- u'icon': u'tool-wiki', 'tool_name': 'wiki'} in menu[0]['children']
+ u'icon': u'tool-wiki', 'tool_name': 'wiki'} in wiki_menu['children']
@td.with_wiki
def test_neighborhood_home(self):
[2/2] git commit: [#7287] Added docs for using ApacheAccessHandler.py
for SCM auth
Posted by jo...@apache.org.
[#7287] Added docs for using ApacheAccessHandler.py for SCM auth
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/61c766c8
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/61c766c8
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/61c766c8
Branch: refs/heads/cj/7287
Commit: 61c766c81ff25775687e13777ceebb180718201c
Parents: 158d2e7
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Tue Mar 25 17:14:53 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Mar 25 17:14:53 2014 +0000
----------------------------------------------------------------------
Allura/docs/scm_host.rst | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/61c766c8/Allura/docs/scm_host.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/scm_host.rst b/Allura/docs/scm_host.rst
index 0e11e8a..82bb6a7 100644
--- a/Allura/docs/scm_host.rst
+++ b/Allura/docs/scm_host.rst
@@ -170,6 +170,47 @@ Then Apache SVN will serve repositories for all Allura projects and subprojects.
+Configuring Git/SVN/Hg to use Allura auth via mod_python and ApacheAccessHandler.py
+===================================================================================
+
+This is the easiest way to integrate authentication for SCM access with Allura. It uses
+mod_python and the handler in `scripts/ApacheAccessHandler.py` to query Allura directly
+for auth and permissions before allowing access to the SCM. Of course, this only works
+for SCM access over HTTP(S).
+
+First, you need to ensure that mod_python is installed:
+
+.. code-block:: console
+
+ sudo aptitude install libapache2-mod-python
+
+Then, in the VirtualHost section where you proxy SCM requests to git, SVN, or Hg, add the
+access handler, e.g.:
+
+.. code-block:: apache
+
+ <LocationMatch "^/(git|svn|hg)/">
+ AddHandler mod_python .py
+ PythonAccessHandler /var/local/allura/scripts/ApacheAccessHandler.py
+ AuthType Basic
+ AuthName "SCM Access"
+ AuthBasicAuthoritative off
+ PythonOption ALLURA_VIRTUALENV /var/local/env-allura
+ PythonOption ALLURA_AUTH_URL https://127.0.0.1/auth/do_login
+ PythonOption ALLURA_PERM_URL https://127.0.0.1/auth/repo_permissions
+ </LocationMatch>
+
+If the SCM is hosted seperately from Allura, update the URLs as appropriate.
+Even if using localhost, it is recommended to use HTTPS, since the username
+and password will be otherwise be sent in the clear to Allura.
+
+.. warning::
+
+ Currently, for Mercurial, the handler doesn't correctly distinguish read
+ and write requests and thus requires WRITE permission for every request.
+
+
+
Configuring Git/SVN/Hg to use Allura auth via LDAP and ssh
============================================================