delete old
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2354 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
parent
ce1defe4fb
commit
5729ecc2df
@ -1,69 +0,0 @@
|
|||||||
# ChangeLog for www-apps/trac-acct_mgr
|
|
||||||
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# $Header: $
|
|
||||||
|
|
||||||
31 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
-trac-acct_mgr-0.1.3.ebuild, -trac-acct_mgr-0.2.1.ebuild,
|
|
||||||
-trac-acct_mgr-0.2.1-r1.ebuild, -trac-acct_mgr-0.2.1-r2.ebuild,
|
|
||||||
+trac-acct_mgr-0.2.1-r3.ebuild:
|
|
||||||
cleanup
|
|
||||||
|
|
||||||
26 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
trac-acct_mgr-0.1.3.ebuild, trac-acct_mgr-0.2.1.ebuild,
|
|
||||||
trac-acct_mgr-0.2.1-r1.ebuild, trac-acct_mgr-0.2.1-r2.ebuild:
|
|
||||||
add arm keyword
|
|
||||||
|
|
||||||
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
trac-acct_mgr-0.2.1-r2.ebuild:
|
|
||||||
remove patch
|
|
||||||
|
|
||||||
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
trac-acct_mgr-0.2.1-r2.ebuild:
|
|
||||||
add korrekt deep
|
|
||||||
|
|
||||||
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
trac-acct_mgr-0.2.1-r2.ebuild:
|
|
||||||
remove reistration patch
|
|
||||||
|
|
||||||
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
+trac-acct_mgr-0.2.1-r2.ebuild,
|
|
||||||
+files/replaceMessageWrapper-with-genshi-markup-against-0.11-branch.patch:
|
|
||||||
add 0.12 branch
|
|
||||||
|
|
||||||
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
trac-acct_mgr-0.2.1-r1.ebuild:
|
|
||||||
add registration patch back
|
|
||||||
|
|
||||||
23 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
trac-acct_mgr-0.2.1-r1.ebuild, +files/redirect-fix.patch:
|
|
||||||
add redirect fix
|
|
||||||
|
|
||||||
23 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
+trac-acct_mgr-0.2.1-r1.ebuild:
|
|
||||||
remove accountmanager patch
|
|
||||||
|
|
||||||
15 Mar 2009; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
|
|
||||||
add RegistrationConfirmationPatch
|
|
||||||
|
|
||||||
18 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
trac-acct_mgr-0.2.1.ebuild:
|
|
||||||
remove IRegistrationConfirmation patch
|
|
||||||
|
|
||||||
18 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
+files/RegistrationConfirmationPatch.diff:
|
|
||||||
add IRegistrationConfirmation patch
|
|
||||||
|
|
||||||
23 Nov 2008; Mario Fetka <mario.fetka@gmail.com>
|
|
||||||
trac-acct_mgr-0.2.1.ebuild:
|
|
||||||
correct trac dependency
|
|
||||||
|
|
||||||
23 Jul 2008; Mario Fetka <mario-fetka@gmx.at> trac-acct_mgr-0.2.1.ebuild:
|
|
||||||
correct typo
|
|
||||||
|
|
||||||
23 Jul 2008; Mario Fetka <mario-fetka@gmx.at> +metadata.xml,
|
|
||||||
+trac-acct_mgr-0.2.1.ebuild:
|
|
||||||
Bump to 0.11
|
|
||||||
|
|
||||||
18 Aug 2007; Mario Fetka <mario-fetka@gmx.at> ChangeLog:
|
|
||||||
Initial ebuild for Trac AccountManager
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
|||||||
AUX RegistrationConfirmationPatch.diff 4570 RMD160 e844d2b40e2bf3ca05777f836d346a881d661bdb SHA1 dbf528abc61c510df84ad8a67d2ba657f3dda3ca SHA256 2c4499175037fd06a5e7661a5d61ef97a178b720e5cfe5973d711095b6604088
|
|
||||||
AUX redirect-fix.patch 579 RMD160 ace1b0a2e46f2bf47266e348643f69e50daa173f SHA1 32494b5b9e36236433305aeabdc01527e51b6004 SHA256 f3ec357c65642753eda0e11266e84916497ffecbd2e8f5d1d667773835486709
|
|
||||||
AUX replaceMessageWrapper-with-genshi-markup-against-0.11-branch.patch 2759 RMD160 e108ae24e5fafa399745d898a12a3f98694b7a0e SHA1 1b00e9ed79e6063a8ec10cab528ab0d709c5f708 SHA256 b478be6bcae846552bd6f538a1eb21788cb7381ace8439d365d134022b471186
|
|
||||||
EBUILD trac-acct_mgr-0.2.1-r3.ebuild 1141 RMD160 d9e2bb3ff4d6046089fd17a3b9c4f8c938284400 SHA1 edafb1e024379a84a06026629c3834418ffcd427 SHA256 9773e5ebce7ff69a7da2fe73f1343b9a6c30a2ea2af730e40038afd0b149eb36
|
|
||||||
MISC ChangeLog 2164 RMD160 d51afebd7f2dfb4a95efee872128ee9bde3f8ff3 SHA1 f3b8549ca0d9220bd881298179cbbc605d20bbc6 SHA256 a71130b8886f65f9c7bc18ee5e9f06e992020356322dc53e33c9f047e2bae62f
|
|
||||||
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
|
|
@ -1,121 +0,0 @@
|
|||||||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
|
||||||
Date: 2009-03-15
|
|
||||||
Initial Package Version: 0.2.1
|
|
||||||
Origin: http://trac-hacks.org/wiki/RegistrationConfirmationPatch
|
|
||||||
Upstream Status: unknown
|
|
||||||
Description: This is a patch for AccountManagerPlugin that adds an
|
|
||||||
IRegistrationConfirmation extension point that enables pluggable
|
|
||||||
verifications for new user registration.
|
|
||||||
|
|
||||||
diff -Naur trac-acct_mgr-0.2.1.orig/acct_mgr/api.py trac-acct_mgr-0.2.1/acct_mgr/api.py
|
|
||||||
--- trac-acct_mgr-0.2.1.orig/acct_mgr/api.py 2009-03-15 07:26:49.412311159 +0000
|
|
||||||
+++ trac-acct_mgr-0.2.1/acct_mgr/api.py 2009-03-15 07:27:13.305249903 +0000
|
|
||||||
@@ -77,6 +77,19 @@
|
|
||||||
"""User deleted
|
|
||||||
"""
|
|
||||||
|
|
||||||
+class IRegistrationConfirmation(Interface):
|
|
||||||
+ """An interface for receiving notification before and after the new user
|
|
||||||
+ registration form has been submitted.
|
|
||||||
+ """
|
|
||||||
+
|
|
||||||
+ def pre_registration(self, req):
|
|
||||||
+ """Returns the markup to be added to the registration form
|
|
||||||
+ """
|
|
||||||
+
|
|
||||||
+ def verify_registration(self, req):
|
|
||||||
+ """Returns an error message if confirmation fails, or None on success
|
|
||||||
+ """
|
|
||||||
+
|
|
||||||
class AccountManager(Component):
|
|
||||||
"""The AccountManager component handles all user account management methods
|
|
||||||
provided by the IPasswordStore interface.
|
|
||||||
diff -Naur trac-acct_mgr-0.2.1.orig/acct_mgr/templates/register.html trac-acct_mgr-0.2.1/acct_mgr/templates/register.html
|
|
||||||
--- trac-acct_mgr-0.2.1.orig/acct_mgr/templates/register.html 2009-03-15 07:26:49.368327943 +0000
|
|
||||||
+++ trac-acct_mgr-0.2.1/acct_mgr/templates/register.html 2009-03-15 07:27:13.305249903 +0000
|
|
||||||
@@ -43,6 +43,11 @@
|
|
||||||
class="textwidget" size="20" />
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
+ <py:if test="extra_required_content">
|
|
||||||
+ <div>
|
|
||||||
+ ${Markup(extra_required_content)}
|
|
||||||
+ </div>
|
|
||||||
+ </py:if>
|
|
||||||
</fieldset>
|
|
||||||
<fieldset>
|
|
||||||
<legend>Optional</legend>
|
|
||||||
diff -Naur trac-acct_mgr-0.2.1.orig/acct_mgr/web_ui.py trac-acct_mgr-0.2.1/acct_mgr/web_ui.py
|
|
||||||
--- trac-acct_mgr-0.2.1.orig/acct_mgr/web_ui.py 2009-03-15 07:26:49.412311159 +0000
|
|
||||||
+++ trac-acct_mgr-0.2.1/acct_mgr/web_ui.py 2009-03-15 07:27:13.307559560 +0000
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
from genshi.builder import tag
|
|
||||||
|
|
||||||
from api import AccountManager
|
|
||||||
+from api import IRegistrationConfirmation
|
|
||||||
from acct_mgr.util import urandom
|
|
||||||
|
|
||||||
def _create_user(req, env, check_permissions=True):
|
|
||||||
@@ -351,6 +352,8 @@
|
|
||||||
|
|
||||||
implements(INavigationContributor, IRequestHandler, ITemplateProvider)
|
|
||||||
|
|
||||||
+ listeners = ExtensionPoint(IRegistrationConfirmation)
|
|
||||||
+
|
|
||||||
def __init__(self):
|
|
||||||
self._enable_check(log=True)
|
|
||||||
|
|
||||||
@@ -394,19 +397,28 @@
|
|
||||||
'name' : None,
|
|
||||||
'email' : None,
|
|
||||||
},
|
|
||||||
+ 'extra_required_content' : self._get_extra_content(req),
|
|
||||||
}
|
|
||||||
+ error = None
|
|
||||||
if req.method == 'POST' and action == 'create':
|
|
||||||
- try:
|
|
||||||
- _create_user(req, self.env)
|
|
||||||
- except TracError, e:
|
|
||||||
- data['registration_error'] = e.message
|
|
||||||
- formdata = getattr(e, 'acctmgr', None)
|
|
||||||
- if formdata:
|
|
||||||
- data['acctmgr'] = formdata
|
|
||||||
+ for listener in self.listeners:
|
|
||||||
+ error = listener.verify_registration(req)
|
|
||||||
+ if error is not None:
|
|
||||||
+ break
|
|
||||||
+ data['registration_error'] = error
|
|
||||||
+ if error is None:
|
|
||||||
+ try:
|
|
||||||
+ _create_user(req, self.env)
|
|
||||||
+ except TracError, e:
|
|
||||||
+ data['registration_error'] = e.message
|
|
||||||
+ formdata = getattr(e, 'acctmgr', None)
|
|
||||||
+ if formdata:
|
|
||||||
+ data['acctmgr'] = formdata
|
|
||||||
+ else:
|
|
||||||
+ raise e
|
|
||||||
else:
|
|
||||||
- raise e
|
|
||||||
- else:
|
|
||||||
- req.redirect(req.href.login())
|
|
||||||
+ req.redirect(req.href.login())
|
|
||||||
+
|
|
||||||
data['reset_password_enabled'] = \
|
|
||||||
(self.env.is_component_enabled(AccountModule)
|
|
||||||
and NotificationSystem(self.env).smtp_enabled)
|
|
||||||
@@ -414,6 +426,14 @@
|
|
||||||
return 'register.html', data, None
|
|
||||||
|
|
||||||
|
|
||||||
+ def _get_extra_content(self, req):
|
|
||||||
+ ret = ""
|
|
||||||
+ for listener in self.listeners:
|
|
||||||
+ response = listener.pre_registration(req)
|
|
||||||
+ if response is not None:
|
|
||||||
+ ret += response
|
|
||||||
+ return ret
|
|
||||||
+
|
|
||||||
# ITemplateProvider
|
|
||||||
|
|
||||||
def get_htdocs_dirs(self):
|
|
@ -1,13 +0,0 @@
|
|||||||
Index: acct_mgr/web_ui.py
|
|
||||||
===================================================================
|
|
||||||
--- acct_mgr/web_ui.py (revision 4132)
|
|
||||||
+++ acct_mgr/web_ui.py (working copy)
|
|
||||||
@@ -185,7 +185,7 @@
|
|
||||||
if req.authname and req.authname != 'anonymous':
|
|
||||||
if req.session.get('force_change_passwd', False):
|
|
||||||
redirect_url = req.href.prefs('account')
|
|
||||||
- if req.path_info != redirect_url:
|
|
||||||
+ if req.href(req.path_info) != redirect_url:
|
|
||||||
req.redirect(redirect_url)
|
|
||||||
return (template, data, content_type)
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
|||||||
Index: acct_mgr/web_ui.py
|
|
||||||
===================================================================
|
|
||||||
--- acct_mgr/web_ui.py (revision 5267)
|
|
||||||
+++ acct_mgr/web_ui.py (working copy)
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
from trac.web.main import IRequestHandler, IRequestFilter
|
|
||||||
from trac.web import chrome
|
|
||||||
from trac.web.chrome import INavigationContributor, ITemplateProvider
|
|
||||||
+from genshi.core import Markup
|
|
||||||
from genshi.builder import tag
|
|
||||||
|
|
||||||
from api import AccountManager
|
|
||||||
@@ -239,7 +240,7 @@
|
|
||||||
if force_change_password:
|
|
||||||
del(req.session['force_change_passwd'])
|
|
||||||
req.session.save()
|
|
||||||
- chrome.add_notice(req, MessageWrapper(tag(
|
|
||||||
+ chrome.add_notice(req, Markup(tag(
|
|
||||||
"Thank you for taking the time to update your password."
|
|
||||||
)))
|
|
||||||
force_change_password = False
|
|
||||||
@@ -248,7 +249,7 @@
|
|
||||||
else:
|
|
||||||
data.update({'error': 'Invalid action'})
|
|
||||||
if force_change_password:
|
|
||||||
- chrome.add_warning(req, MessageWrapper(tag(
|
|
||||||
+ chrome.add_warning(req, Markup(tag(
|
|
||||||
"You are required to change password because of a recent "
|
|
||||||
"password change request. ",
|
|
||||||
tag.b("Please change your password now."))))
|
|
||||||
@@ -507,16 +508,6 @@
|
|
||||||
return [resource_filename(__name__, 'templates')]
|
|
||||||
|
|
||||||
|
|
||||||
-class MessageWrapper(object):
|
|
||||||
- """Wrapper for add_warning and add_notice to work around the requirement
|
|
||||||
- for a % operator."""
|
|
||||||
- def __init__(self, body):
|
|
||||||
- self.body = body
|
|
||||||
-
|
|
||||||
- def __mod__(self, rhs):
|
|
||||||
- return self.body
|
|
||||||
-
|
|
||||||
-
|
|
||||||
class EmailVerificationNotification(SingleUserNofification):
|
|
||||||
template_name = 'verify_email.txt'
|
|
||||||
|
|
||||||
@@ -549,7 +540,7 @@
|
|
||||||
# tickets. As such, this email verifying code won't be used on them
|
|
||||||
return handler
|
|
||||||
if handler is not self and 'email_verification_token' in req.session:
|
|
||||||
- chrome.add_warning(req, MessageWrapper(tag.span(
|
|
||||||
+ chrome.add_warning(req, Markup(tag.span(
|
|
||||||
'Your permissions have been limited until you ',
|
|
||||||
tag.a(href=req.href.verify_email())(
|
|
||||||
'verify your email address'))))
|
|
||||||
@@ -566,7 +557,7 @@
|
|
||||||
req.session['email_verification_token'] = self._gen_token()
|
|
||||||
req.session['email_verification_sent_to'] = req.session.get('email')
|
|
||||||
self._send_email(req)
|
|
||||||
- chrome.add_notice(req, MessageWrapper(tag.span(
|
|
||||||
+ chrome.add_notice(req, Markup(tag.span(
|
|
||||||
'An email has been sent to ', req.session['email'],
|
|
||||||
' with a token to ',
|
|
||||||
tag.a(href=req.href.verify_email())(
|
|
@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<herd>maintainer-wanted</herd>
|
|
||||||
</pkgmetadata>
|
|
@ -1,35 +0,0 @@
|
|||||||
# Copyright 1999-2010 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
|
|
||||||
|
|
||||||
EAPI="2"
|
|
||||||
PYTHON_DEPEND="2"
|
|
||||||
SUPPORT_PYTHON_ABIS="1"
|
|
||||||
RESTRICT_PYTHON_ABIS="3.*"
|
|
||||||
|
|
||||||
inherit distutils subversion
|
|
||||||
|
|
||||||
ESVN_REPO_URI="http://trac-hacks.org/svn/accountmanagerplugin/trunk"
|
|
||||||
DESCRIPTION="The AccountManagerPlugin offers several features for managing user accounts."
|
|
||||||
HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
|
|
||||||
|
|
||||||
LICENSE="trac"
|
|
||||||
KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
SLOT="0"
|
|
||||||
|
|
||||||
DEPEND="dev-python/setuptools"
|
|
||||||
RDEPEND=">=www-apps/trac-0.12"
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
elog "To enable the AccountManager plugin in your Trac environments, you have to add:"
|
|
||||||
elog " [components]"
|
|
||||||
elog " trac.web.auth.LoginModule = disabled"
|
|
||||||
elog " acct_mgr.web_ui.LoginModule = enabled"
|
|
||||||
elog " acct_mgr.web_ui.RegistrationModule = disabled"
|
|
||||||
elog "to your trac.ini files."
|
|
||||||
elog
|
|
||||||
elog "To be able to see the Admin tab, your users must have the TRAC_ADMIN permission"
|
|
||||||
elog "and/or the TICKET_ADMIN permission."
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user