fedora-accounts index.html, 1.24, 1.25 nagmail.py, 1.1, 1.2 receive-cla.py, 1.20, 1.21 reset-password.cgi, 1.7, 1.8 website.py, 1.1, 1.2
Patrick Barnes (nman64)
fedora-extras-commits at redhat.com
Tue Jul 11 09:13:11 UTC 2006
Author: nman64
Update of /cvs/fedora/fedora-accounts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14170
Modified Files:
index.html nagmail.py receive-cla.py reset-password.cgi
website.py
Log Message:
Consistent URLs (admin.fedoraproject.org)
More informative email notification
A couple of other minor fixes
Index: index.html
===================================================================
RCS file: /cvs/fedora/fedora-accounts/index.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- index.html 21 Jan 2006 08:04:42 -0000 1.24
+++ index.html 11 Jul 2006 09:13:08 -0000 1.25
@@ -38,7 +38,7 @@
<div id="fedora-side-left">
<div id="fedora-side-nav-label">Site Navigation:</div>
<ul id="fedora-side-nav">
- <li><strong><a href="https://admin.fedora.redhat.com/accounts/">Accounts Home</a></strong></li>
+ <li><strong><a href="https://admin.fedoraproject.org/accounts/">Accounts Home</a></strong></li>
<li><a href="http://fedoraproject.org/wiki/Infrastructure/AccountSystem">Help</a></li>
</ul>
</div>
@@ -65,7 +65,7 @@
<h1>Setting Up Your Account</h1>
-<h2 id="newaccount"><a href="https://admin.fedora.redhat.com/accounts/userbox.cgi">Apply for a New Account</a></h2>
+<h2 id="newaccount"><a href="https://admin.fedoraproject.org/accounts/userbox.cgi">Apply for a New Account</a></h2>
<p>
Filling out this form is the first step you should take. It will ask for basic account information that is needed to provide you with the services you require. You will need to know your GPG key ID, and you will need to upload your SSH public key. See the Fedora Project wiki's <a href="http://fedoraproject.org/wiki/Cryptography">Cryptography</a> page for more information about GPG and SSH.
@@ -74,7 +74,7 @@
<p><a href="http://fedoraproject.org/wiki/Infrastructure/AccountSystem/NewAccount">More Information</a></p>
-<h2 id="requestcla"><a href="https://admin.fedora.redhat.com/accounts/send-cla.cgi">Request the Contributor License Agreement</a></h2>
+<h2 id="requestcla"><a href="https://admin.fedoraproject.org/accounts/send-cla.cgi">Request the Contributor License Agreement</a></h2>
<p>
After applying for a new account, you should request the Fedora Contributor License Agreement. You must use your GPG key to sign and return the CLA before submitting contributions to the Fedora Project.
@@ -87,7 +87,7 @@
<p><a href="http://fedoraproject.org/wiki/Infrastructure/AccountSystem/RequestCLA">More Information</a></p>
-<h2 id="editaccount"><a href="https://admin.fedora.redhat.com/accounts/userbox.cgi?_edit=1">Edit Your Account</a></h2>
+<h2 id="editaccount"><a href="https://admin.fedoraproject.org/accounts/userbox.cgi?_edit=1">Edit Your Account</a></h2>
<p>
You can update your account details and change your group memberships at any time. You should always apply for membership in the groups you contribute to. See the <a href="http://fedoraproject.org/wiki/Projects">individual project pages</a> for details about what groups you should apply for.
@@ -96,7 +96,7 @@
<p><a href="http://fedoraproject.org/wiki/Infrastructure/AccountSystem/EditAccount">More Information</a></p>
-<h2 id="downloadcert"><a href="https://admin.fedora.redhat.com/accounts/gen-cert.cgi">Download a client-side certificate</a></h2>
+<h2 id="downloadcert"><a href="https://admin.fedoraproject.org/accounts/gen-cert.cgi">Download a client-side certificate</a></h2>
<p>
For CVS access, you will need to download a client-side certificate for use in authenticating to the Fedora CVS file uploader. Place the file in '<tt>~/.fedora.cert</tt>', where the Fedora CVS configuration will look for it by default.
@@ -108,8 +108,8 @@
<h2 id="otheractions">Other Actions</h2>
<ul>
- <li><a href="https://admin.fedora.redhat.com/accounts/logout.cgi">Logout</a></li>
- <li><a href="https://admin.fedora.redhat.com/accounts/reset-password.cgi">Password Reset</a></li>
+ <li><a href="https://admin.fedoraproject.org/accounts/logout.cgi">Logout</a></li>
+ <li><a href="https://admin.fedoraproject.org/accounts/reset-password.cgi">Password Reset</a></li>
</ul>
@@ -118,8 +118,8 @@
These actions are for group administrators and sponsors.
<ul>
- <li><a href="https://admin.fedora.redhat.com/accounts/admin-list.cgi">Edit Users</a></li>
- <li><a href="https://admin.fedora.redhat.com/accounts/admin-groups.cgi">Edit Groups</a></li>
+ <li><a href="https://admin.fedoraproject.org/accounts/admin-list.cgi">Edit Users</a></li>
+ <li><a href="https://admin.fedoraproject.org/accounts/admin-groups.cgi">Edit Groups</a></li>
</ul>
<p>
Index: nagmail.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/nagmail.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagmail.py 22 Apr 2005 00:32:15 -0000 1.1
+++ nagmail.py 11 Jul 2006 09:13:08 -0000 1.2
@@ -39,8 +39,9 @@
%s
-You have the ability to do this. To take action, go to
-https://admin.fedora.redhat.com/accounts/groupbox.cgi?_editme=Edit&name=%s
+You have the ability to do this. To take action, go to:
+
+https://admin.fedoraproject.org/accounts/groupbox.cgi?_editme=Edit&name=%s
-- Fedora Account System
""" % (weneed, arow[1],
Index: receive-cla.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/receive-cla.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- receive-cla.py 13 Jul 2005 15:45:42 -0000 1.20
+++ receive-cla.py 11 Jul 2006 09:13:08 -0000 1.21
@@ -12,8 +12,8 @@
outmsg = email.Message.Message()
outmsg.add_header('To', msg['From'])
outmsg.add_header('From', ('Fedora Account System <%s>' % (website.accounts_email,)))
- outmsg.add_header('Subject', 'Error processing Fedora accounts e-mail')
- outmsg.set_payload('With regards to "%s".\nYour message could not be processed.\nReason %s'
+ outmsg.add_header('Subject', 'Error processing Fedora Account System email')
+ outmsg.set_payload('With regards to "%s".\n\nYour message could not be processed.\n\nReason:\n\n%s'
% (msg.get('Subject', '<unknown>'), error_desc))
fh_read, fh_write = popen2.popen2("/usr/sbin/sendmail -t")
@@ -21,7 +21,7 @@
fh_write.write(str(outmsg))
fh_write.close()
- sys.stderr.write("Error processing e-mail from %s: %s\n" % (msg['From'], error_desc))
+ sys.stderr.write("Error processing email from %s: %s\n" % (msg['From'], error_desc))
def get_interesting_parts(msg):
candidates = []
@@ -50,7 +50,7 @@
interesting_parts = get_interesting_parts(msg)
if not len(interesting_parts):
- return do_failure(msg_data, msg, 'No PGP signature found')
+ return do_failure(msg_data, msg, 'No GPG signature found. The signature may have been attached improperly or not at all. For guidance, please see the following page:\n\nhttp://fedoraproject.org/wiki/Infrastructure/AccountSystem/CLAHowTo')
interesting_part = interesting_parts[0][0]
gpg_obj = GPG.GPGSubprocess()
@@ -64,22 +64,22 @@
# Check that the signature matches who we think it should match
if not sig.valid:
- return do_failure(msg_data, msg, 'Signature was not valid. Please see http://fedoraproject.org/wiki/DocsProject/UsingGpg/CreatingKeys')
+ return do_failure(msg_data, msg, 'The signature could not be processed. The signature may have been created or attached improperly, it might not match the key ID you have registered in the Account System, or the public key may not have been found on the key server. For guidance, please see the following page:\n\nhttp://fedoraproject.org/wiki/Infrastructure/AccountSystem/CLAHowTo')
m = sre.search('Signing code: ([0-9a-f]+)', sig.data)
if not m or sig.data.find('Contributor License Agreement (CLA)') < 0:
- return do_failure(msg_data, msg, 'The GPG-signed part of the message did not contain a signed CLA')
+ return do_failure(msg_data, msg, 'The GPG-signed part of the message did not contain a signed CLA. The signed CLA must be signed and attached. For guidance, please see the following page:\n\nhttp://fedoraproject.org/wiki/Infrastructure/AccountSystem/CLAHowTo')
sig_code = m.group(1)
m = sre.search('type "I agree" here: *[Ii] +[aA][gG][rR][eE][eE]', sig.data)
if not m:
- return do_failure(msg_data, msg, 'You did not type "I agree" in the CLA')
+ return do_failure(msg_data, msg, 'The text "I agree" was not found in the CLA. The CLA must be properly completed. For guidance, please see the following page:\n\nhttp://fedoraproject.org/wiki/Infrastructure/AccountSystem/CLAHowTo')
dbc = dbh.cursor()
dbc.execute("SELECT * FROM role WHERE role_status = %s", (sig_code,))
if not dbc.rowcount:
- return do_failure(msg_data, msg, 'The signing code was not valid. (You may have already completed the CLA.)')
+ return do_failure(msg_data, msg, 'The signing code was not valid. Each time the CLA is sent, a new code is generated and included. The latest code must be found in the CLA when it is signed and returned. It is also possible that you have already completed the CLA-signing process. For guidance, please see the following page:\n\nhttp://fedoraproject.org/wiki/Infrastructure/AccountSystem/CLAHowTo')
role_row = dbc.fetchhash()
dbc.execute("SELECT * FROM person WHERE id = %s" % (role_row['person_id'], ))
@@ -96,10 +96,10 @@
found_sig = (aline.find('<' + person_row['email'] + '>') >= 0)
fh_read.close()
if not found_sig:
- return do_failure(msg_data, msg, "The signature's username [%s] did not match the e-mail address on file [%s]." % (sig.username, person_row['email']))
+ return do_failure(msg_data, msg, "A signature was found, but the email address in the signature, [%s], did not match the email address registered in the Account System, [%s]. For guidance, please see the following page:\n\nhttp://fedoraproject.org/wiki/Infrastructure/AccountSystem/CLAHowTo" % (sig.username, person_row['email']))
if sig.key_id[-len(person_row['gpg_keyid']):].lower() != person_row['gpg_keyid'].lower():
- return do_failure(msg_data, msg, "The signature's key ID did not match the key ID on file.")
+ return do_failure(msg_data, msg, "A signature was found, but the signature's key ID did not match the key ID registered in the Account System. For guidance, please see the following page:\n\nhttp://fedoraproject.org/wiki/Infrastructure/AccountSystem/CLAHowTo")
qry = "UPDATE role SET role_status = 'approved' WHERE person_id = %s AND project_group_id = %s"
qargs = (role_row['person_id'], role_row['project_group_id'])
@@ -119,21 +119,26 @@
pieces = process_data(msg_data)
if pieces:
msg, fuser, coolpart = pieces
- sys.stderr.write("CLA request completed successfully for %s\n" % msg['From'])
+ sys.stderr.write("The Fedora CLA has been successfully completed by %s\n" % msg['From'])
outmsg = email.Message.Message()
outmsg.add_header('To', msg['From'])
outmsg.add_header('From', ('Fedora Account System <%s>' % (website.accounts_email,)))
- outmsg.add_header('Subject', 'CLA request completed successfully')
+ outmsg.add_header('Subject', 'The Fedora CLA has been successfully completed')
outmsg.set_payload("""
-Your Contributor License Agreement titled "%s" was processed. This means
-that you can now become an approved member of Fedora groups such as
-'cvsextras' that allow you to contribute. Please see
-https://admin.fedora.redhat.com/accounts/ for information on joining
-these groups.
+Your signed Fedora Contributor License Agreement was processed successfully.
-Thank you for being involved,
--- The Fedora Team
+You can now contribute to the Fedora Project. If you intend to work with a
+specific Fedora project, you may need to join additional groups in the
+Account System.
+
+For more information, please see the following page:
+
+http://fedoraproject.org/wiki/Infrastructure/AccountSystem
+
+Thank you for joining our team!
+
+-- The Fedora Project
"""
% (msg.get('Subject', '<unknown>'),))
Index: reset-password.cgi
===================================================================
RCS file: /cvs/fedora/fedora-accounts/reset-password.cgi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- reset-password.cgi 11 Aug 2005 16:34:00 -0000 1.7
+++ reset-password.cgi 11 Jul 2006 09:13:08 -0000 1.8
@@ -59,17 +59,24 @@
fhr, fh = popen2.popen2("/usr/sbin/sendmail -t")
fhr.close()
fh.write("""To: %s <%s>
-Subject: Fedora password reset
+Subject: Fedora Account System Password Reset Request
From: Fedora Account System <%s>
-Please go to %sreset-password.cgi?username=%s&magic=%s&timeout=%s
-to retrieve a temporary password. This link is valid for the next 72 hours.
+You or someone posing as you has requested that your password in the
+Fedora Account System be reset.
--- The Fedora administrators
+To reset your password, enter the following URL in your browser:
+
+%sreset-password.cgi?username=%s&magic=%s&timeout=%s
+
+This will issue you a temporary password. This URL is valid for 72 hours.
+
+If you did not request a password reset, do nothing and your password will
+not be changed.
""" % (arow['human_name'], arow['email'], website.accounts_email,
website.accounts_url, arow['username'], gen_magic(arow['username'], the_timeout), the_timeout))
fh.close()
- print "A URL has been e-mailed to you. Please click on it to retrieve a temporary password."
+ print "A URL has been emailed to you. Please use it to retrieve a temporary password."
website.print_footer("Reset password")
sys.exit(0)
else:
@@ -81,10 +88,12 @@
else:
website.print_header("Reset password")
print """
-Enter your account information to reset your password
-<form method=post action=reset-password.cgi>
-Username (or E-mail): <input type=text name=username maxlength=80 size=24 value="%s"><br>
-<input type=submit value="Reset">
+<p>Enter your account information to reset your password.</p>
+<form method="post" action="reset-password.cgi">
+<p>Username (or E-mail):</p>
+<input type="text" name="username" maxlength="80" size="24" value="%s">
+<p>Select "Reset" to have a URL emailed to you that will allow you to reset your password.</p>
+<input type="submit" value="Reset">
</form>
""" % (username, )
Index: website.py
===================================================================
RCS file: /cvs/fedora/fedora-accounts/website.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- website.py 15 Jun 2006 23:14:12 -0000 1.1
+++ website.py 11 Jul 2006 09:13:08 -0000 1.2
@@ -446,7 +446,7 @@
Fedora user %(username)s, aka %(human_name)s <%(email)s> has requested
membership in the %(name)s group and needs a sponsor.
-Please go to https://admin.fedora.redhat.com/accounts/groupbox.cgi?_editme=Edit&name=%(name)s to take action.
+Please go to https://admin.fedoraproject.org/accounts/groupbox.cgi?_editme=Edit&name=%(name)s to take action.
-- The Fedora Account System
""" % group_info,
@@ -459,7 +459,7 @@
Fedora user %(username)s, aka %(human_name)s <%(email)s> has requested
membership in the %(name)s group - that membership needs approval.
-Please go to https://admin.fedora.redhat.com/accounts/groupbox.cgi?_editme=Edit&name=%(name)s to take action.
+Please go to https://admin.fedoraproject.org/accounts/groupbox.cgi?_editme=Edit&name=%(name)s to take action.
-- The Fedora Account System
""" % group_info,
More information about the fedora-extras-commits
mailing list