November 2016 - sysadmin-notify

by Nicolas Chauvet

commit ae500161855847b93c9ecc4fd3311c2b252b92ab Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Nov 4 08:35:04 2016 +0100 Fixup groups for build group_vars/buildhw | 2 +- group_vars/buildvm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) --- diff --git a/group_vars/buildhw b/group_vars/buildhw index ebe7733..63077de 100644 --- a/group_vars/buildhw +++ b/group_vars/buildhw @@ -1,6 +1,6 @@ --- host_group: kojibuilder -fas_client_groups: sysadmin-build +fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/00releng-sudoers" freezes: true diff --git a/group_vars/buildvm b/group_vars/buildvm index 267bdc1..210e263 100644 --- a/group_vars/buildvm +++ b/group_vars/buildvm @@ -14,8 +14,7 @@ virt_install_command: "{{ virt_install_command_one_nic }}" # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder -#fas_client_groups: sysadmin-relenag -fas_client_groups: sysadmin-main +fas_client_groups: sysadmin-releng sudoers: "{{ private }}/files/sudo/sysadmin-main" koji_hub_nfs: "rpmfusion_koji"

8 years, 1 month

1
0
0 / 0

[ansible] Fixup fas groups for ipsilon

by Nicolas Chauvet

commit 0e58683695e32712e81693bc08320b80a0e921f7 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Nov 4 08:28:39 2016 +0100 Fixup fas groups for ipsilon group_vars/ipsilon | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/group_vars/ipsilon b/group_vars/ipsilon index 2ec3a60..c4d8688 100644 --- a/group_vars/ipsilon +++ b/group_vars/ipsilon @@ -12,4 +12,4 @@ tcp_ports: [ 80, 443 ] # Neeed for rsync from log01 for logs. #custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-main,sysadmin +fas_client_groups: sysadmin-main,sysadmin-accounts

8 years, 1 month

1
0
0 / 0

[ansible] Switch from fas to admin

by Nicolas Chauvet

commit 153d102510c2f0ba617dbe8b9bd3858d9fb4ab0d Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Nov 4 08:22:51 2016 +0100 Switch from fas to admin roles/ipsilon/files/openid_server.py | 3 +-- roles/ipsilon/files/templates/login/form.html | 4 ++-- roles/ipsilon/templates/configuration.conf | 6 +----- roles/packager_alias/files/owner-email.py | 2 +- roles/pkgdb2/templates/pkgdb2_admin.cfg | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) --- diff --git a/roles/ipsilon/files/openid_server.py b/roles/ipsilon/files/openid_server.py index e804edc..1280011 100644 --- a/roles/ipsilon/files/openid_server.py +++ b/roles/ipsilon/files/openid_server.py @@ -1043,8 +1043,7 @@ class OpenIDResponse(object): @change: 2.1.0 added the ENCODE_HTML_FORM response. """ if self.request.mode in BROWSER_REQUEST_MODES: - do_post_trusts = ['http://admin.rpmfusion.org/', - 'http://fas.rpmfusion.org/'] + do_post_trusts = ['http://admin.rpmfusion.org/'] if self.request.trust_root in do_post_trusts: # Workaround, since too many clients don't follow the spec return ENCODE_HTML_FORM diff --git a/roles/ipsilon/files/templates/login/form.html b/roles/ipsilon/files/templates/login/form.html index 62b9939..5a8a725 100644 --- a/roles/ipsilon/files/templates/login/form.html +++ b/roles/ipsilon/files/templates/login/form.html @@ -24,7 +24,7 @@ <input class="form-control" id="password" name="login_password" type="password" placeholder="Password" /> </div> <div class="col-xs-12 text-xs-right"> - <small class="text-muted"><a target="_blank" href="https://fas.rpmfusion.org/accounts/user/resetpass">Forgot password?</a></small> + <small class="text-muted"><a target="_blank" href="https://admin.rpmfusion.org/accounts/user/resetpass">Forgot password?</a></small> </div> </div> <div class="form-group row m-b-0"> @@ -37,6 +37,6 @@ {% block after_card %} -<div class="text-xs-center"><small class="text-muted">Don't have a FAS account? <a target="_blank" href="https://fas.rpmfusion.org/accounts/user/new">Sign up now</a>.</small></div> +<div class="text-xs-center"><small class="text-muted">Don't have a FAS account? <a target="_blank" href="https://admin.rpmfusion.org/accounts/user/new">Sign up now</a>.</small></div> {% endblock %} diff --git a/roles/ipsilon/templates/configuration.conf b/roles/ipsilon/templates/configuration.conf index fc81907..52d0ab0 100644 --- a/roles/ipsilon/templates/configuration.conf +++ b/roles/ipsilon/templates/configuration.conf @@ -1,10 +1,6 @@ [login_config] global enabled=fas -{% if env == 'staging' %} -fas FAS url=https://fas.stg.rpmfusion.org/accounts/ -{% else %} -fas FAS url=https://fas.rpmfusion.org/accounts/ -{% endif %} +fas FAS url=https://admin.rpmfusion.org/accounts/ fas FAS Proxy client user Agent=RPM Fusion Ipsilon fas FAS Insecure Auth=True diff --git a/roles/packager_alias/files/owner-email.py b/roles/packager_alias/files/owner-email.py index 5e86a83..d659a38 100755 --- a/roles/packager_alias/files/owner-email.py +++ b/roles/packager_alias/files/owner-email.py @@ -18,7 +18,7 @@ config.read('/etc/fas.conf') pkgdb_url = 'https://admin.rpmfusion.org/pkgdb' -fas = BaseClient('https://fas.rpmfusion.org/accounts', +fas = BaseClient('https://admin.rpmfusion.org/accounts', username=config.get('global', 'login').strip('"'), password=config.get('global', 'password').strip('"')) diff --git a/roles/pkgdb2/templates/pkgdb2_admin.cfg b/roles/pkgdb2/templates/pkgdb2_admin.cfg index 2044bee..b673c7d 100644 --- a/roles/pkgdb2/templates/pkgdb2_admin.cfg +++ b/roles/pkgdb2/templates/pkgdb2_admin.cfg @@ -45,7 +45,7 @@ PKGDB2_BUGZILLA_PASSWORD = None ### FAS information ## URL to the FAS instance to query -PKGDB2_FAS_URL = 'https://fas.rpmfusion.org/accounts' +PKGDB2_FAS_URL = 'https://admin.rpmfusion.org/accounts' ## name of the user the pkgdb application can log in to FAS with PKGDB2_FAS_USER = '{{ fedorathirdpartyUser }}' ## password of the user the pkgdb application can log in to FAS with

8 years, 1 month

1
0
0 / 0

[ansible] Revert "Switch to letsencrypt"

by Nicolas Chauvet

commit 19f4d2e7a684e842f36e66e6fcdf992316f99a80 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Thu Nov 3 18:31:37 2016 +0100 Revert "Switch to letsencrypt" This reverts commit 4d151bc63e634e1f64cfdba361d763d8a47573e2. roles/koji_hub/templates/koji-ssl.conf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/roles/koji_hub/templates/koji-ssl.conf b/roles/koji_hub/templates/koji-ssl.conf index 6a0278d..47a08d6 100644 --- a/roles/koji_hub/templates/koji-ssl.conf +++ b/roles/koji_hub/templates/koji-ssl.conf @@ -98,7 +98,7 @@ SSLCipherSuite {{ ssl_ciphers }} # pass phrase. Note that a kill -HUP will prompt again. A new # certificate can be generated using the genkey(1) command. #SSLCertificateFile /etc/pki/tls/certs/localhost.crt -SSLCertificateFile /etc/pki/tls/certs/koji.rpmfusion.org.cert +SSLCertificateFile /etc/pki/tls/certs/koji_cert.pem # Server Private Key: # If the key is not combined with the certificate, use this @@ -106,7 +106,7 @@ SSLCertificateFile /etc/pki/tls/certs/koji.rpmfusion.org.cert # you've both a RSA and a DSA private key you can configure # both in parallel (to also allow the use of DSA ciphers, etc.) #SSLCertificateKeyFile /etc/pki/tls/private/localhost.key -SSLCertificateKeyFile /etc/pki/tls/private/koji.rpmfusion.org.key +SSLCertificateKeyFile /etc/pki/tls/private/koji_key.pem # Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the @@ -116,7 +116,7 @@ SSLCertificateKeyFile /etc/pki/tls/private/koji.rpmfusion.org.key # when the CA certificates are directly appended to the server # certificate for convinience. #SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt -SSLCertificateChainFile /etc/pki/tls/certs/koji.rpmfusion.org-intermediate.cert +SSLCertificateChainFile /etc/pki/tls/certs/extras_cacert.pem # Certificate Authority (CA): # Set the CA certificate verification path where to find CA

8 years, 1 month

1
0
0 / 0

[ansible] Update packager and new fas

by Nicolas Chauvet

commit e5862ffb7177d92d4b3db5ba2a82557a9ff5e207 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Thu Nov 3 18:21:31 2016 +0100 Update packager and new fas roles/pkgdb2/templates/pkgdb2.cfg | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/roles/pkgdb2/templates/pkgdb2.cfg b/roles/pkgdb2/templates/pkgdb2.cfg index e6a4c52..ae4609c 100644 --- a/roles/pkgdb2/templates/pkgdb2.cfg +++ b/roles/pkgdb2/templates/pkgdb2.cfg @@ -33,7 +33,7 @@ ADMIN_GROUP = ['sysadmin-main', 'cvsadmin'] {% endif %} # Current packager group in RPM Fusion -PKGER_GROUP = 'cvsextras' +PKGER_GROUP = 'packager' ## URLs to fedmenu resources {% if env == 'staging' %} @@ -90,7 +90,7 @@ SITE_URL = '%s/pkgdb' % SITE_ROOT PKGDB2_BUGZILLA_NOTIFICATION = False FAS_OPENID_ENDPOINT = 'https://id.rpmfusion.org/' {% else %} -PKGDB2_FAS_URL = 'https://fas.rpmfusion.org/accounts' +PKGDB2_FAS_URL = 'https://admin.rpmfusion.org/accounts' PKGDB2_FAS_INSECURE = True SITE_ROOT = 'https://admin.rpmfusion.org' SITE_URL = '%s/pkgdb' % SITE_ROOT @@ -165,7 +165,7 @@ address. c) Change your RPM Fusion Account System email to match your existing bugzilla.rpmfusion.org account. -https://fas.rpmfusion.org/accounts login, click on 'my account', +https://admin.rpmfusion.org/accounts login, click on 'my account', then 'edit' and change your email address. If you have questions or concerns, please let us know.

8 years, 1 month

1
0
0 / 0

[ansible] Switch to letsencrypt

by Nicolas Chauvet

commit 4d151bc63e634e1f64cfdba361d763d8a47573e2 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Thu Nov 3 17:42:49 2016 +0100 Switch to letsencrypt roles/koji_hub/templates/koji-ssl.conf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/roles/koji_hub/templates/koji-ssl.conf b/roles/koji_hub/templates/koji-ssl.conf index 47a08d6..6a0278d 100644 --- a/roles/koji_hub/templates/koji-ssl.conf +++ b/roles/koji_hub/templates/koji-ssl.conf @@ -98,7 +98,7 @@ SSLCipherSuite {{ ssl_ciphers }} # pass phrase. Note that a kill -HUP will prompt again. A new # certificate can be generated using the genkey(1) command. #SSLCertificateFile /etc/pki/tls/certs/localhost.crt -SSLCertificateFile /etc/pki/tls/certs/koji_cert.pem +SSLCertificateFile /etc/pki/tls/certs/koji.rpmfusion.org.cert # Server Private Key: # If the key is not combined with the certificate, use this @@ -106,7 +106,7 @@ SSLCertificateFile /etc/pki/tls/certs/koji_cert.pem # you've both a RSA and a DSA private key you can configure # both in parallel (to also allow the use of DSA ciphers, etc.) #SSLCertificateKeyFile /etc/pki/tls/private/localhost.key -SSLCertificateKeyFile /etc/pki/tls/private/koji_key.pem +SSLCertificateKeyFile /etc/pki/tls/private/koji.rpmfusion.org.key # Server Certificate Chain: # Point SSLCertificateChainFile at a file containing the @@ -116,7 +116,7 @@ SSLCertificateKeyFile /etc/pki/tls/private/koji_key.pem # when the CA certificates are directly appended to the server # certificate for convinience. #SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt -SSLCertificateChainFile /etc/pki/tls/certs/extras_cacert.pem +SSLCertificateChainFile /etc/pki/tls/certs/koji.rpmfusion.org-intermediate.cert # Certificate Authority (CA): # Set the CA certificate verification path where to find CA

8 years, 1 month

1
0
0 / 0

[ansible] Fixup template on ! staging

by Nicolas Chauvet

commit bade320d3c2cd6f2aa7eed6992e6488f1b517d9b Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Thu Nov 3 17:11:44 2016 +0100 Fixup template on ! staging roles/koji_hub/tasks/main.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index 81c23d5..f95fef4 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -263,7 +263,7 @@ when: env == "staging" - name: koji ssl config - copy: src=koji-ssl.conf dest=/etc/httpd/conf.d/ssl.conf + template: src=koji-ssl.conf dest=/etc/httpd/conf.d/ssl.conf tags: - config - koji_hub

8 years, 1 month

1
0
0 / 0

[ansible] Add user.py for fas hostfix

by Nicolas Chauvet

commit b6d12819514ab1c38ef635c4d0479aea46fcec11 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Thu Nov 3 17:09:05 2016 +0100 Add user.py for fas hostfix files/hotfix/fas/user.py | 1733 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 1733 insertions(+), 0 deletions(-) --- diff --git a/files/hotfix/fas/user.py b/files/hotfix/fas/user.py new file mode 100644 index 0000000..d616911 --- /dev/null +++ b/files/hotfix/fas/user.py @@ -0,0 +1,1733 @@ +# -*- coding: utf-8 -*- +''' Provides user IO to FAS ''' +# +# Copyright © 2008 Ricky Zhou +# Copyright © 2008-2014 Red Hat, Inc. +# Copyright © 2012 Patrick Uiterwijk +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# General Public License v.2. This program is distributed in the hope that it +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the +# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. You should have +# received a copy of the GNU General Public License along with this program; +# if not, write to the Free Software Foundation, Inc., 51 Franklin Street, +# Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat trademarks that are +# incorporated in the source code or documentation are not subject to the GNU +# General Public License and may only be used or replicated with the express +# permission of Red Hat, Inc. +# +# Author(s): Ricky Zhou <ricky(a)fedoraproject.org> +# Mike McGrath <mmcgrath(a)redhat.com> +# Toshio Kuratomi <toshio(a)redhat.com> +# Patrick Uiterwijk <puiterwijk(a)fedoraproject.org> + +# @error_handler() takes a reference to the error() method defined in the +# class (E0602) + +try: + from bunch import Bunch +except ImportError: + from fedora.client import DictContainer as Bunch + +import turbogears +from turbogears import controllers, expose, identity, \ + validate, validators, error_handler, config, redirect +from turbogears.database import session +import cherrypy +import time +from tgcaptcha2 import CaptchaField +from tgcaptcha2.validator import CaptchaFieldValidator + +from fas.util import send_mail +from fas.lib import submit_to_spamcheck +from fas.lib.gpg import encrypt_text + +import os +import re +import gpgme +import StringIO +import crypt +import requests +from requests_kerberos import HTTPKerberosAuth +import string +import subprocess +from OpenSSL import crypto + +if config.get('use_openssl_rand_bytes', False): + from OpenSSL.rand import bytes as rand_bytes +else: + from os import urandom as rand_bytes + +import pytz +from datetime import datetime +import time + +from sqlalchemy import func +from sqlalchemy.exc import IntegrityError, InvalidRequestError +from sqlalchemy.sql import select + +import logging +log = logging.getLogger(__name__) + +from fedora.tg.utils import request_format + +import fas.fedmsgshim + +import fas +from fas.model import PeopleTable, PersonRolesTable, GroupsTable +from fas.model import People, PersonRoles, Groups, Log, CaptchaNonce +from fas.model import disabled_statuses +from fas import openssl_fas +from fas.auth import ( + is_admin, + cla_done, + undeprecated_cla_done, + can_edit_user, + is_modo +) +from fas.util import available_languages +from fas.validators import KnownUser, PasswordStrength, ValidGPGKeyID, \ + ValidSSHKey, NonFedoraEmail, ValidLanguage, UnknownUser, ValidUsername, \ + ValidHumanWithOverride, MaybeFloat, EVEmail, NonBlockedEmail, UnknownGroup +from fas import _ + +#ADMIN_GROUP = config.get('admingroup', 'accounts') +#system_group = config.get('systemgroup', 'fas-system') +#thirdparty_group = config.get('thirdpartygroup', 'thirdparty') + +CAPTCHA = CaptchaField(name='captcha', label=_('Solve the math problem')) + +class UserCreate(validators.Schema): + ''' Validate information for a new user ''' + username = validators.All( + UnknownUser, + UnknownGroup, + ValidUsername(not_empty=True), + validators.UnicodeString(max=32, min=3), + ) + human_name = validators.All( + validators.UnicodeString(not_empty=True), + ) + human_name_override = validators.All( + ) + email = validators.All( + validators.Email(not_empty=True, strip=True), + NonFedoraEmail(not_empty=True, strip=True), + EVEmail(not_empty=True, strip=True), + NonBlockedEmail(not_empty=True, strip=True), + ) + verify_email = validators.All( + validators.Email(not_empty=True, strip=True), + NonFedoraEmail(not_empty=True, strip=True), + EVEmail(not_empty=True, strip=True), + ) + security_question = validators.UnicodeString(not_empty=True) + security_answer = validators.UnicodeString(not_empty=True) + #fedoraPersonBugzillaMail = validators.Email(strip=True) + postal_address = validators.UnicodeString(max=512) + # Pass the captchanonce use_nonce function to register uses of captchas + captcha = CaptchaFieldValidator(CaptchaNonce.use_nonce) + chained_validators = [ validators.FieldsMatch('email', 'verify_email'), + ValidHumanWithOverride('human_name', 'human_name_override') ] + +class UserSetSecurityQuestion(validators.Schema): + ''' Validate new security question and answer ''' + currentpassword = validators.UnicodeString(not_empty=True) + newquestion = validators.UnicodeString(not_empty=True) + newanswer = validators.UnicodeString(not_empty=True) + +class UserSetPassword(validators.Schema): + ''' Validate new and old passwords ''' + currentpassword = validators.UnicodeString(not_empty=True) + password = PasswordStrength(not_empty=True) + passwordcheck = validators.UnicodeString(not_empty=True) + chained_validators = [validators.FieldsMatch('password', 'passwordcheck')] + +class UserResetPassword(validators.Schema): + password = PasswordStrength(not_empty=True) + passwordcheck = validators.UnicodeString(not_empty=True) + chained_validators = [validators.FieldsMatch('password', 'passwordcheck')] + +class UserSave(validators.Schema): + targetname = KnownUser + human_name = validators.All( + validators.UnicodeString(not_empty=True, max=42), + validators.Regex(regex='^[^\n:<>]+$'), + ) + ircnick = validators.UnicodeString(max=42) + status = validators.OneOf([ + 'active', 'inactive'] + disabled_statuses) + ssh_key = ValidSSHKey(max=5000) + gpg_keyid = ValidGPGKeyID + telephone = validators.UnicodeString # TODO - could use better validation + email = validators.All( + validators.Email(not_empty=True, strip=True, max=128), + NonFedoraEmail(not_empty=True, strip=True, max=128), + EVEmail(not_empty=True, strip=True, max=128), + ) + locale = ValidLanguage(not_empty=True, strip=True) + #fedoraPersonBugzillaMail = validators.Email(strip=True, max=128) + #fedoraPersonKeyId- Save this one for later :) + postal_address = validators.UnicodeString(max=512) + timezone = validators.UnicodeString # TODO - could use better validation + country_code = validators.UnicodeString(max=2, strip=True) + privacy = validators.Bool + latitude = MaybeFloat + longitude = MaybeFloat + comments = validators.UnicodeString # TODO - could use better validation + +def generate_password(password=None, length=16): + ''' Generate Password + + :arg password: Plain text password to be crypted. Random one generated + if None. + :arg length: Length of password to generate. + returns: crypt.crypt utf-8 password + ''' + secret = {} # contains both hash and password + + # From crypt(3) manpage. + salt_charset = string.ascii_letters + string.digits + './' + salt = random_string(salt_charset, 16) + hash_id = '6' # SHA-512 + salt_str = '$' + hash_id + '$' + salt + + if password is None: + password_charset = string.ascii_letters + string.digits + password = random_string(password_charset, length) + + secret['hash'] = crypt.crypt(password.encode('utf-8'), salt_str) + secret['pass'] = password + + return secret + +def random_string(charset, length): + '''Generates a random string for password and salts. + + This use a pseudo-random number generator suitable for cryptographic + use, such as /dev/urandom or (better) OpenSSL's RAND_bytes. + + :arg length: Length of salt to be generated + :returns: String of salt + ''' + s = '' + + while length > 0: + r = rand_bytes(length) + for c in r: + # Discard all bytes that aren't in the charset. This is the + # simplest way to ensure that the function is not biased. + if c in charset: + s += c + length -= 1 + + return s + +class User(controllers.Controller): + ''' Our base User controller for user based operations ''' + # Regex to tell if something looks like a crypted password + crypted_password_re = re.compile('^\$[0-9]\$.*\$.*') + + def __init__(self): + '''Create a User Controller. + ''' + + @identity.require(identity.not_anonymous()) + def index(self): + '''Redirect to view + ''' + redirect('/user/view/%s' % identity.current.user_name) + + def json_request(self): + ''' Determines if the request is for json or not_ + + :returns: true if the request is json, else false + ''' + return 'tg_format' in cherrypy.request.params and \ + cherrypy.request.params['tg_format'] == 'json' + + + @expose(template="fas.templates.error") + def error(self, tg_errors=None): + '''Show a friendly error message''' + if not tg_errors: + turbogears.redirect('/') + return dict(tg_errors=tg_errors) + + @identity.require(identity.not_anonymous()) + @validate(validators= {'username': KnownUser }) + @error_handler(error) # pylint: disable-msg=E0602 + @expose(template="fas.templates.user.view", allow_json=True) + def view(self, username=None): + '''View a User. + ''' + show = {} + show['show_postal_address'] = config.get('show_postal_address') + if not username: + username = identity.current.user_name + person = People.by_username(username) + if identity.current.user_name == username: + personal = True + else: + personal = False + admin = is_admin(identity.current) + (cla, undeprecated_cla) = undeprecated_cla_done(person) + (modo, can_update) = is_modo(identity.current) + person_data = person.filter_private() + person_data['approved_memberships'] = list(person.approved_memberships) + person_data['unapproved_memberships'] = list(person.unapproved_memberships) + person_data['roles'] = person.roles + + roles = person.roles + roles.json_props = { + 'PersonRole': ('group',), + 'Groups': ('unapproved_roles',), + } + return dict(person=person_data, cla=cla, undeprecated=undeprecated_cla, personal=personal, + admin=admin, modo=modo, can_update=can_update, show=show) + + @identity.require(identity.not_anonymous()) + @validate(validators={ 'targetname' : KnownUser }) + @error_handler(error) # pylint: disable-msg=E0602 + @expose(template="fas.templates.user.edit") + def edit(self, targetname=None): + '''Edit a user + ''' + show = {} + show['show_postal_address'] = config.get('show_postal_address') + languages = available_languages() + + username = identity.current.user_name + person = People.by_username(username) + + admin = is_admin(identity.current) + + if targetname: + target = People.by_username(targetname) + else: + target = People.by_username(identity.current.user_name) + + if not can_edit_user(person, target): + turbogears.flash(_('You cannot edit %s') % target.username) + turbogears.redirect('/user/view/%s' % target.username) + return dict() + + target = target.filter_private() + return dict(target=target, languages=languages, admin=admin, show=show) + + @identity.require(identity.not_anonymous()) + @validate(validators=UserSave()) + @error_handler(error) # pylint: disable-msg=E0602 + @expose(template='fas.templates.user.edit') + def save(self, targetname, human_name, telephone, email, status, + postal_address=None, ssh_key=None, ircnick=None, gpg_keyid=None, + comments='', locale='en', timezone='UTC', country_code='', + latitude=None, longitude=None, privacy=False): + ''' Saves user information to database + + :arg targetname: Target user to alter + :arg human_name: Human name of target user + :arg telephone: Telephone number of target user + :arg email: Email address of target user + :arg status: Status of target user + :arg postal_address: Mailing address of target user + :arg ssh_key: ssh key of target user + :arg ircnick: IRC nick of the target user + :arg gpg_keyid: gpg key id of target user + :arg comments: Misc comments about target user + :arg locale: Locale of the target user for language purposes + :arg timezone: Timezone of target user + :arg country_code: Country Code of target user + :arg latitude: Latitude of target user + :arg privacy: Determine if the user info should be private for user + + :returns: empty dict + ''' + + # person making changes + username = identity.current.user_name + person = People.by_username(username) + + # Account being changed + target = People.by_username(targetname) + + # Make sure email is lowercase + email = email.lower() + + emailflash = '' + changed = [] # record field names that changed for fedmsg + + if not can_edit_user(person, target): + turbogears.flash(_("You do not have permission to edit '%s'") % \ + target.username) + turbogears.redirect('/user/view/%s' % target.username) + return dict() + + try: + if target.status != status: + if (status in disabled_statuses or target.status \ + in disabled_statuses) and \ + not is_admin(person): + turbogears.flash(_( + 'Only admin can enable or disable an account.')) + return dict() + else: + # TODO: revoke cert + target.old_password = target.password + target.password = '*' + for group in target.unapproved_memberships: + try: + target.remove(group, person) + except fas.RemoveError: + pass + Log(author_id=person.id, description= + '%(person)s\'s status changed from %(old)s to %(new)s' % \ + {'person': target.username, + 'old': target.status, + 'new': status}) + target.status = status + target.status_change = datetime.now(pytz.utc) + changed.append('status') + + if target.email != email: + test = select([PeopleTable.c.username], + func.lower(PeopleTable.c.email) \ + == email.lower()).execute().fetchall() + if test: + turbogears.flash(_( + 'Somebody is already using that email address.' + )) + turbogears.redirect("/user/edit/%s" % target.username) + return dict() + + if is_admin(person) and person.username != target.username: + emailflash = _('Since you are an administrator ' + \ + 'modifying another account, there will be no ' + \ + 'validation of the email address') + target.email = email + changed.append('email') + else: + emailflash = _('Before your new email takes effect, you ' + \ + 'must confirm it. You should receive an email with ' + \ + 'instructions shortly.') + token_charset = string.ascii_letters + string.digits + token = random_string(token_charset, 32) + target.unverified_email = email + target.emailtoken = token + change_subject = _('Email Change Requested for %s') % \ + person.username + change_text = _(''' + You have recently requested to change your RPM Fusion Account System email + to this address. To complete the email change, you must confirm your + ownership of this email by visiting the following URL (you will need to + login with your RPM Fusion account first): + + %(verifyurl)s/accounts/user/verifyemail/%(token)s + ''') % { 'verifyurl' : config.get('base_url_filter.base_url').rstrip('/'), 'token' : token} + send_mail(email, change_subject, change_text) + # Note: email is purposefully not added to the changed[] list + # here because we don't change it until the new email is + # verified (in a separate method) + + # note, ssh_key is often None or empty string at this point + # (file upload). Testing ssh_key first prevents removing the + # ssh_key in this case. The clearkey() method is used for removing + # an ssh_key. + if ssh_key and target.ssh_key != ssh_key: + target.ssh_key = ssh_key + changed.append('ssh_key') + + # Other fields don't need any special handling + fields = ('human_name', 'telephone', 'postal_address', 'ircnick', + 'gpg_keyid', 'comments', 'locale', 'timezone', + 'country_code', 'privacy', 'latitude', 'longitude') + for field in fields: + old = getattr(target, field) + new = locals()[field] + if (old or new) and old != new: + setattr(target, field, new) + changed.append(field) + + except TypeError, error: + turbogears.flash(_('Your account details could not be saved: %s') + % error) + turbogears.redirect("/user/edit/%s" % target.username) + return dict() + else: + change_subject = _('RPM Fusion Account Data Update %s') % \ + target.username + change_text = _(''' +You have just updated information about your account. If you did not request +these changes please contact root(a)rpmfusion.org and let them know. Your +updated information is: + + username: %(username)s + full name: %(fullname)s + ircnick: %(ircnick)s + telephone: %(telephone)s + locale: %(locale)s + timezone: %(timezone)s + country code: %(country_code)s + latitude: %(latitude)s + longitude: %(longitude)s + privacy flag: %(privacy)s + ssh_key: %(ssh_key)s + gpg_keyid: %(gpg_keyid)s + +If the above information is incorrect, please log in and fix it: + + %(editurl)s/accounts/user/edit/%(username)s +''') % { 'username' : target.username, + 'fullname' : target.human_name, + 'ircnick' : target.ircnick, + 'telephone' : target.telephone, + 'locale' : target.locale, + 'timezone' : target.timezone, + 'country_code' : target.country_code, + 'latitude' : target.latitude, + 'longitude' : target.longitude, + 'privacy' : target.privacy, + 'ssh_key' : target.ssh_key, + 'gpg_keyid' : target.gpg_keyid, + 'editurl' : config.get('base_url_filter.base_url').rstrip('/')} + send_mail(target.email, change_subject, change_text) + turbogears.flash(_('Your account details have been saved.') + \ + ' ' + emailflash) + + fas.fedmsgshim.send_message(topic="user.update", msg={ + 'agent': person.username, + 'user': target.username, + 'fields': changed, + }) + turbogears.redirect("/user/view/%s" % target.username) + return dict() + + @identity.require(identity.not_anonymous()) + @expose() + def updatestatus(self, people, status): + ''' Change account status on given user. ''' + target = People.by_username(people) + user = identity.current.user_name + + # Prevent user from using url directly to update + # account if requested's status has been set already. + if target.status == status: + turbogears.redirect("/user/view/%s" % target.username) + return dict() + + (modo, can_update) = is_modo(user) + if (modo and can_update) or is_admin(user): + try: + target.status = status + target.status_change = datetime.now(pytz.utc) + except TypeError, error: + turbogears.flash(_('Account status could not be changed: %s') + % error) + turbogears.redirect("/user/view/%s" % target.username) + return dict() + else: + turbogears.flash(_("You're not allowed to update accounts!")) + turbogears.redirect("/user/view/%s" % target.username) + return dict() + + if is_admin(user) and status in disabled_statuses: + target.old_password = target.password + target.password = '*' + for group in target.unapproved_memberships: + try: + target.remove(group, target.username) + except fas.RemoveError: + pass + + subject = _('Your RPM Fusion Account has been set to %s') % status + text = _(''' +Your account status have just been set to %s by an admin or an account's moderator. +If this is not expected, please contact root(a)rpmfusion.org and let them know. + +- The RPM Fusion Account System + ''') % status + send_mail(target.email, subject, text) + + fas.fedmsgshim.send_message(topic="user.update", msg={ + 'agent': user, + 'user': target.username, + 'fields': ['status'], + }) + turbogears.redirect('/user/view/%s' % target.username) + return dict() + + @identity.require(identity.not_anonymous()) + @expose(template="fas.templates.user.list", allow_json=True) + def dump(self, search=u'a*', groups=''): + ''' Return a list of users sorted by search + + :arg search: Search wildcard (a* or *blah*) to filter by usernames + :arg groups: Filter by specific groups + + :returns: dict of people, unapproved_paople and search string + ''' + groups_to_return_list = groups.split(',') + groups_to_return = [] + # Special Logic, find out all the people who are in more then one group + if '@all' in groups_to_return_list: + groups_results = Groups.query().filter(Groups.group_type!='cla') + for group in groups_results: + groups_to_return.append(group.name) + + for group_type in groups_to_return_list: + if group_type.startswith('@'): + group_list = Groups.query.filter(Groups.group_type.in_( + [group_type.strip('@')])) + for group in group_list: + groups_to_return.append(group.name) + else: + groups_to_return.append(group_type) + people = People.query.join('roles').filter( + PersonRoles.role_status=='approved').join( + PersonRoles.group).filter(Groups.name.in_( groups_to_return )) + + # p becomes what we send back via json + people_dict = [] + for strip_p in people: + strip_p = strip_p.filter_private() + if strip_p.status == 'active': + people_dict.append({ + 'username' : strip_p.username, + 'id' : strip_p.id, + 'ssh_key' : strip_p.ssh_key, + 'human_name': strip_p.human_name, + 'password' : strip_p.password + }) + + return dict(people=people_dict, unapproved_people=[], search=search) + + #class UserList(validators.Schema): + # search = validators.UnicodeString() + # fields = validators.Set() + # limit = validators.Int() + #@validate(validators=UserList()) + @identity.require(identity.not_anonymous()) + @expose(template="fas.templates.user.list", allow_json=True) + def list(self, search=u'a*', fields=None, limit=None, status=None, + by_email=None, by_ircnick=None): + '''List users + + :kwarg search: Limit the users returned by the search string. * is a + wildcard character. + :kwarg fields: Fields to return in the json request. Default is + to return everything. + :kwargs status: if specified, only returns accounts with this status. + :kwargs by_email: if true or 1, the search is done by email instead of + nickname. + :kwargs by_ircnick: if true or 1, the search is done by ircnick instead + of nickname. + + This should be fixed up at some point. Json data needs at least the + following for fasClient to work:: + + list of users with these attributes: + username + id + ssh_key + human_name + password + + The template, on the other hand, needs to know about:: + + list of usernames with information about whether the user is + approved in cla_done + + supybot-fedora uses the email attribute + + The json information is useful so we probably want to create a new + method for it at some point. One which returns the list of users with + more complete information about themselves. Then this method can + change to only returning username and cla status. + ''' + ### FIXME: Should port this to a validator + # Work around a bug in TG (1.0.4.3-2) + # When called as /user/list/* search is a str type. + # When called as /user/list/?search=* search is a unicode type. + if not search: + search = u'*' + if not isinstance(search, unicode) and isinstance(search, basestring): + search = unicode(search, 'utf-8', 'replace') + + re_search = search.translate({ord(u'*'): ur'%'}).lower() + + if isinstance(fields, basestring): + # If a string, then make a list + fields = [fields] + elif fields: + # This makes sure the field is a list + fields = list(fields) + else: + fields = [] + + # Ensure limit is a valid number + if limit: + try: + limit = int(limit) + except ValueError: + limit = None + + # Set a reasonable default limit for web interface results + if not limit and request_format() != 'json': + limit = 100 + + joined_roles = PeopleTable.outerjoin(PersonRolesTable, + onclause=PersonRolesTable.c.person_id==PeopleTable.c.id)\ + .outerjoin(GroupsTable, + onclause=PersonRolesTable.c.group_id==GroupsTable.c.id) + + if str(by_email).lower() in ['1', 'true']: + if ur'%' in re_search: + stmt = select([joined_roles]).where(People.email.ilike( + re_search)).order_by(People.username).limit(limit) + else: + stmt = select([joined_roles]).where(People.email==re_search)\ + .order_by(People.username).limit(limit) + elif str(by_ircnick).lower() in ['1', 'true']: + if ur'%' in re_search: + stmt = select([joined_roles]).where(People.ircnick.ilike( + re_search)).order_by(People.username).limit(limit) + else: + stmt = select([joined_roles]).where(People.ircnick==re_search)\ + .order_by(People.username).limit(limit) + else: + if ur'%' in re_search: + stmt = select([joined_roles]).where(People.username.ilike( + re_search)).order_by(People.username).limit(limit) + else: + stmt = select([joined_roles]).where(People.username==re_search)\ + .order_by(People.username).limit(limit) + + if status is not None: + stmt = stmt.where(People.status==status) + stmt.use_labels = True + people = stmt.execute() + + people_map = dict() + group_map = dict() + + # This replicates what filter_private does. At some point we might + # want to figure out a way to pull this into a function + if identity.in_any_group(config.get('admingroup', 'accounts'), + config.get('systemgroup', 'fas-system')): + # Admin and system are the same for now + user = 'admin' + elif identity.current.anonymous: + user = 'anonymous' + else: + user = 'public' + # user_perms is a synonym for user with one difference + # If user is public then we end up changing user_perms + # depending on whether the record is for the user themselves and if + # the record has privacy set + user_perms = user + + for record in people: + if record.people_username not in people_map: + # Create a new person + person = Bunch() + if user == 'public': + # The general public gets different fields depending on + # the record being accessed + if identity.current.user_name == record.people_username: + user_perms = 'self' + elif record.people_privacy: + user_perms = 'privacy' + else: + user_perms = 'public' + + # Clear all the fields so the client side doesn't get KeyError + for field in People.allow_fields['complete']: + person[field] = None + + # Fill in the people record + for field in People.allow_fields[user_perms]: + person[field] = record['people_%s' % field] + if identity.in_group(config.get('thirdpartygroup', + 'thirdparty')): + # Thirdparty is a little strange as it has to obey the + # privacy flag just like a normal user but we allow a few + # fields to be sent on in addition (ssh_key for now) + for field in People.allow_fields['thirdparty']: + person[field] = record['people_%s' % field] + # Make sure the password field is a default value that won't + # cause issue for scripts + if 'password' not in People.allow_fields[user_perms]: + person.password = '*' + + person.group_roles = {} + person.memberships = [] + person.roles = [] + people_map[record.people_username] = person + else: + # We need to have a reference to the person since we're + # going to add a group to it + person = people_map[record.people_username] + + if record.groups_name not in group_map: + # Create the group + group = Bunch() + group.id = record.groups_id + group.display_name = record.groups_display_name + group.name = record.groups_name + group.invite_only = record.groups_invite_only + group.url = record.groups_url + group.creation = record.groups_creation + group.irc_network = record.groups_irc_network + group.needs_sponsor = record.groups_needs_sponsor + group.prerequisite_id = record.groups_prerequisite_id + group.user_can_remove = record.groups_user_can_remove + group.mailing_list_url = record.groups_mailing_list_url + group.mailing_list = record.groups_mailing_list + group.irc_channel = record.groups_irc_channel + group.apply_rules = record.groups_apply_rules + group.joinmsg = record.groups_joinmsg + group.group_type = record.groups_group_type + group.owner_id = record.groups_owner_id + group_map[record.groups_name] = group + else: + group = group_map[record.groups_name] + + if group.name not in person.group_roles: + # Add the group to the person record + person.memberships.append(group) + + role = Bunch() + role.internal_comments = record.person_roles_internal_comments + role.role_status = record.person_roles_role_status + role.creation = record.person_roles_creation + role.sponsor_id = record.person_roles_sponsor_id + role.person_id = record.person_roles_person_id + role.approval = record.person_roles_approval + role.group_id = record.person_roles_group_id + role.role_type = record.person_roles_role_type + person.group_roles[group.name] = role + person.roles.append(role) + + if len(people_map) == 1 and people_map.get(search) and request_format() != 'json': + turbogears.redirect('/user/view/%s' % search) + return dict() + + approved = [] + unapproved = [] + cla_done_group = config.get('cla_done_group', 'cla_done') + for person in people_map.itervalues(): + if cla_done_group in person.group_roles: + cla_status = person.group_roles[cla_done_group].role_status + else: + cla_status = 'unapproved' + + # Current default is to return everything unless fields is set + if fields: + # If set, return only the fields that were requested + try: + person = dict((field, getattr(person, field)) for field + in fields) + except AttributeError, error: + # An invalid field was given + turbogears.flash(_('Invalid field specified: %(error)s') % + {'error': str(error)}) + if request_format() == 'json': + return dict(exc='Invalid', tg_template='json') + else: + return dict(people=[], unapproved_people=[], + search=search) + + if cla_status == 'approved': + approved.append(person) + else: + unapproved.append(person) + + if not (approved or unapproved): + turbogears.flash(_("No users found matching '%s'") % search) + + return dict(people=approved, unapproved_people=unapproved, + search=search) + + @identity.require(identity.not_anonymous()) + @expose(format='json') + def email_list(self, search=u'*'): + '''Return a username to email address mapping. + + Keyword arguments: + :search: filter the results by this search string. * is a wildcard and + the filter is anchored to the beginning of the username by default. + + Returns: a mapping of usernames to email addresses. Note that users + of all statuses, including bot, inactive, expired, and + admin_disabled are included in this mapping. + ''' + ### FIXME: Should port this to a validator + # Work around a bug in TG (1.0.4.3-2) + # When called as /user/list/* search is a str type. + # When called as /user/list/?search=* search is a unicode type. + if not isinstance(search, unicode) and isinstance(search, basestring): + search = unicode(search, 'utf-8', 'replace') + + re_search = search.translate({ord(u'*'): ur'%'}).lower() + + people = select([PeopleTable.c.username, + PeopleTable.c.email]).where(People.username.like( + re_search)).order_by('username').execute().fetchall() + + emails = dict(people) + + return dict(emails=emails) + + @identity.require(identity.not_anonymous()) + @expose(template='fas.templates.user.verifyemail') + def verifyemail(self, token, cancel=False): + ''' Used to verify the email address after a user has changed it + + :arg token: Token emailed to the user, if correct the email is verified + :arg cancel: Cancel the outstanding change request + :returns: person and token + ''' + username = identity.current.user_name + person = People.by_username(username) + if cancel: + person.emailtoken = '' + turbogears.flash(_('Your pending email change has been canceled.'+\ + ' The email change token has been invalidated.')) + turbogears.redirect('/user/view/%s' % username) + return dict() + if not person.unverified_email: + turbogears.flash(_('You do not have any pending email changes.')) + turbogears.redirect('/user/view/%s' % username) + return dict() + if person.emailtoken and (person.emailtoken != token): + turbogears.flash(_('Invalid email change token.')) + turbogears.redirect('/user/view/%s' % username) + return dict() + + person = person.filter_private() + return dict(person=person, token=token) + + @identity.require(identity.not_anonymous()) + @expose() + def setemail(self, token): + ''' Set email address once a request has been made + + :arg token: Token of change request + :returns: Empty dict + ''' + username = identity.current.user_name + person = People.by_username(username) + if not (person.unverified_email and person.emailtoken): + turbogears.flash(_('You do not have any pending email changes.')) + turbogears.redirect('/user/view/%s' % username) + return dict() + if person.emailtoken != token: + turbogears.flash(_('Invalid email change token.')) + turbogears.redirect('/user/view/%s' % username) + return dict() + # Log the change + old_email = person.email + person.email = person.unverified_email + Log(author_id=person.id, description='Email changed from %s to %s' % + (old_email, person.email)) + person.unverified_email = '' + session.flush() + turbogears.flash(_('You have successfully changed your email to \'%s\'' + ) % person.email) + fas.fedmsgshim.send_message(topic="user.update", msg={ + 'agent': person.username, + 'user': person.username, + 'fields': ('email',), + }) + turbogears.redirect('/user/view/%s' % username) + return dict() + + @expose(template='fas.templates.user.new') + def new(self): + ''' Displays the user with a form to to fill out to to sign up + + :returns: Captcha object and show + ''' + + show = {} + show['show_postal_address'] = config.get('show_postal_address') + if identity.not_anonymous(): + turbogears.flash(_('No need to sign up, you have an account!')) + turbogears.redirect('/user/view/%s' % identity.current.user_name) + return dict(captcha=CAPTCHA, show=show) + + @expose(template='fas.templates.new') + @validate(validators=UserCreate()) + @error_handler(error) # pylint: disable-msg=E0602 + def create(self, username, human_name, email, verify_email, security_question, security_answer, telephone=None, + postal_address=None, age_check=False, captcha=None, human_name_override=False): + ''' Parse arguments from the UI and make sure everything is in order. + + :arg username: requested username + :arg human_name: full name of new user + :arg human_name_override: override check of user's full name + :arg email: email address of the new user + :arg verify_email: double check of users email + :arg security_question: the security question in case user loses access to email + :arg security_answer: the answer to the security question + :arg telephone: telephone number of new user + :arg postal_address: Mailing address of user + :arg age_check: verifies user is over 13 years old + :arg captcha: captcha to ensure the user is a human + :returns: person + + ''' + # TODO: perhaps implement a timeout- delete account + # if the e-mail is not verified (i.e. the person changes + # their password) within X days. + + # Check that the user claims to be over 13 otherwise it puts us in a + # legally sticky situation. + email = email.lower() + verify_email = verify_email.lower() + + if not age_check: + turbogears.flash(_("We're sorry but out of special concern " + \ + "for children's privacy, we do not knowingly accept online " + \ + "personal information from children under the age of 13. We " + \ + "do not knowingly allow children under the age of 13 to become " +\ + "registered members of our sites or buy products and services " + \ + "on our sites. We do not knowingly collect or solicit personal " +\ + "information about children under 13.")) + turbogears.redirect('/') + email_test = select([PeopleTable.c.username], + func.lower(PeopleTable.c.email)==email.lower())\ + .execute().fetchall() + if email_test: + turbogears.flash(_("Sorry. That email address is already in " + \ + "use. Perhaps you forgot your password?")) + turbogears.redirect("/") + return dict() + + if email != verify_email: + turbogears.flash(_("Sorry. Email addresses do not match")) + turbogears.redirect("/") + return dict() + + # Check that the user claims to be over 13 otherwise it puts us in a + # legally sticky situation. + if not age_check: + turbogears.flash(_("We're sorry but out of special concern " + \ + "for children's privacy, we do not knowingly accept online " + \ + "personal information from children under the age of 13. We " + \ + "do not knowingly allow children under the age of 13 to become " +\ + "registered members of our sites or buy products and services " + \ + "on our sites. We do not knowingly collect or solicit personal " +\ + "information about children under 13.")) + turbogears.redirect(redirect_location) + return dict() + test = select([PeopleTable.c.username], + func.lower(PeopleTable.c.email)==email.lower()).execute().fetchall() + if test: + turbogears.flash(_("Sorry. That email address is already in " + \ + "use. Perhaps you forgot your password?")) + turbogears.redirect(redirect_location) + return dict() + + try: + person, accepted = self.create_user(username.strip(), + human_name.strip(), email, security_question, security_answer, + telephone, postal_address.strip(), age_check) + except IntegrityError: + turbogears.flash(_("Your account could not be created. Please " + \ + "contact %s for assistance.") % config.get('accounts_email')) + turbogears.redirect('/user/new') + return dict() + else: + Log(author_id=person.id, description='Account created: %s' % + person.username) + if accepted is True: + turbogears.flash(_('Your password has been emailed to you. ' + \ + 'Please log in with it and change your password')) + elif accepted is False: + turbogears.flash(_('Your registration has been denied. Please' + \ + 'email accounts(a)rpmfusion.org if you ' + \ + 'disagree with this decission.')) + else: + turbogears.flash(_('We are processing your account application, ' + \ + 'please watch for an email from us with the status')) + turbogears.redirect('/user/changepass') + return dict() + + def create_user(self, username, human_name, email, security_question, security_answer, + telephone=None, postal_address=None, age_check=False, redirect_location='/'): + ''' create_user: saves user information to the database and sends a + welcome email. + + :arg username: requested username + :arg human_name: full name of new user + :arg email: email address of the new user + :arg security_question: the question to identify the user when he loses access to his email + :arg security_answer: the answer to the security question + :arg telephone: telephone number of new user + :arg postal_address: Mailing address of user + :arg age_check: verifies user is over 13 years old + :arg redirect: location to redirect to after creation + :returns: person + ''' + person = People() + person.username = username + person.human_name = human_name + person.telephone = telephone + person.postal_address = postal_address + person.email = email + person.security_question = security_question + person.security_answer = encrypt_text(config.get('key_securityquestion'), security_answer) + person.password = '*' + person.status = 'spamcheck_awaiting' + person.old_password = generate_password()['hash'] + session.flush() + if config.get('antispam.registration.autoaccept', True): + self.accept_user(person) + return (person, True) + + else: # Not autoaccepted, submit to spamcheck + r = submit_to_spamcheck('fedora.fas.registration', + {'user': person.filter_private('systems', True)}) + try: + log.info('Spam response: %s' % r.text) + response = r.json() + result = response['result'] + except Exception as ex: + log.error('Spam checking failed: %s' % repr(ex)) + result = 'checking' + + # Result is either accepted, denied or checking + if result == 'accepted': + self.accept_user() + return (person, True) + elif result == 'denied': + person.status = 'spamcheck_denied' + session.flush() + return (person, False) + else: + return (person, None) + + + def accept_user(self, person): + newpass = generate_password() + send_mail(person.email, _('Welcome to the RPM Fusion Project!'), _(''' +You have created a new RPM Fusion account! +Your username is: %(username)s +Your new password is: %(password)s + +Please go to %(base_url)s%(webpath)s/user/changepass +to change it. + +Welcome to the RPM Fusion Project. Now that you've signed up for an +account you're probably desperate to start contributing, and with that +in mind we hope this e-mail might guide you in the right direction to +make this process as easy as possible. + +RPM Fusion is an exciting project with lots going on, and you can +contribute in a huge number of ways, using all sorts of different +skill sets. To find out about the different ways you can contribute to +RPM Fusion, you can visit our join page which provides more information +about all the different roles we have available. + +http://rpmfusion.org/Contributors/ + +If you already know how you want to contribute to RPM Fusion, and have +found the group already working in the area you're interested in, then +there are a few more steps for you to get going. + +Foremost amongst these is to sign up for the team or project's mailing +list that you're interested in - and if you're interested in more than +one group's work, feel free to sign up for as many mailing lists as +you like! This is because mailing lists are where the majority of work +gets organised and tasks assigned, so to stay in the loop be sure to +keep up with the messages. + +Once this is done, it's probably wise to send a short introduction to +the list letting them know what experience you have and how you'd like +to help. From here, existing members of the team will help you to find +your feet as a RPM Fusion contributor. + +Please remember that you are joining a community made of contributors +from all around the world, as such please stop by the Community Code of +Conduct. + +https://fedoraproject.org/code-of-conduct + +And finally, from all of us here at the RPM Fusion Project, we're looking +forward to working with you! +''') % {'username': person.username, + 'password': newpass['pass'], + 'base_url': config.get('base_url_filter.base_url'), + 'webpath': config.get('server.webpath')}) + person.password = newpass['hash'] + person.status = 'active' + session.flush() + fas.fedmsgshim.send_message(topic="user.create", msg={ + 'agent': person.username, + 'user': person.username, + }) + + @identity.require(identity.not_anonymous()) + @expose(allow_json=True) + def acceptuser(self, people, status): + ''' Accept account from antispam service. ''' + target = People.by_username(people) + user = identity.current.user_name + + # Prevent user from using url directly to update + # account if requested's status has been set already. + if target.status == status: + return {'result': 'nochange'} + + (modo, can_update) = is_modo(user) + if (modo and can_update) or is_admin(user): + try: + target.status = status + target.status_change = datetime.now(pytz.utc) + except TypeError, error: + return {'result': 'error', 'error': str(error)} + else: + return {'result': 'unauthorized'} + + self.accept_user(target) + + return {'result': 'OK'} + + @identity.require(identity.not_anonymous()) + @expose(template="fas.templates.user.changequestion") + def changequestion(self): + ''' Provides forms for user to change security question/answer + + :rerturns: empty dict + ''' + return dict() + + @identity.require(identity.not_anonymous()) + @validate(validators=UserSetSecurityQuestion()) + @error_handler(error) + @expose(template="fas.templates.user.changequestion") + def setquestion(self, currentpassword, newquestion, newanswer): + username = identity.current.user_name + person = People.by_username(username) + + # These are done here instead of in the validator because we may not + # have access to identity when testing the validators + if not person.password == crypt.crypt(currentpassword.encode('utf-8'), + person.password): + turbogears.flash(_('Your current password did not match')) + return dict() + + try: + person.security_question = newquestion + person.security_answer = encrypt_text(config.get('key_securityquestion'), newanswer) + Log(author_id=person.id, description='Security question changed') + session.flush() + # TODO: Make this catch something specific. + except: + Log(author_id=person.id, description='Security question change failed!') + turbogears.flash(_("Your security question could not be changed.")) + return dict() + else: + turbogears.flash(_("Your security question has been changed.")) + fas.fedmsgshim.send_message(topic="user.update", msg={ + 'agent': person.username, + 'user': person.username, + 'fields': ['security_question', 'security_answer'], + }) + turbogears.redirect('/user/view/%s' % identity.current.user_name) + return dict() + + @identity.require(identity.not_anonymous()) + @expose(template="fas.templates.user.changepass") + def changepass(self): + ''' Provides forms for user to change password + + :returns: empty dict + ''' + return dict() + + @identity.require(identity.not_anonymous()) + @validate(validators=UserSetPassword()) + @error_handler(error) # pylint: disable-msg=E0602 + @expose(template="fas.templates.user.changepass") + def setpass(self, currentpassword, password, passwordcheck): + username = identity.current.user_name + person = People.by_username(username) + + # This is here due to a bug in older formencode where + # ChainedValidators did not fire + if password != passwordcheck: + turbogears.flash(_('passwords did not match')) + return dict() + + # These are done here instead of in the validator because we may not + # have access to identity when testing the validators + if not person.password == crypt.crypt(currentpassword.encode('utf-8'), + person.password): + turbogears.flash(_('Your current password did not match')) + return dict() + + if currentpassword == password: + turbogears.flash(_( + 'Your new password cannot be the same as your old one.')) + return dict() + + newpass = generate_password(password) + + try: + person.old_password = person.password + person.password = newpass['hash'] + person.password_changed = datetime.now(pytz.utc) + Log(author_id=person.id, description='Password changed') + if config.get('ipa_sync_enabled', False): + self.sync_pwd_change_to_ipa(person.username, password) + session.flush() + # TODO: Make this catch something specific. + except: + session.rollback() + Log(author_id=person.id, description='Password change failed!') + turbogears.flash(_("Your password could not be changed.")) + return dict() + else: + turbogears.flash(_("Your password has been changed.")) + fas.fedmsgshim.send_message(topic="user.update", msg={ + 'agent': person.username, + 'user': person.username, + 'fields': ['password'], + }) + turbogears.redirect('/user/view/%s' % identity.current.user_name) + return dict() + + def sync_pwd_change_to_ipa(self, user_name, password): + os.system('kinit -k -t %s %s' % (config.get('ipa_sync_keytab'), + config.get('ipa_sync_principal'))) + c = requests.post('https://%s/ipa/session/login_kerberos' + % config.get('ipa_sync_server'), + auth=HTTPKerberosAuth(), + verify=config.get('ipa_sync_certfile')) + r = requests.post('https://%s/ipa/session/json' + % config.get('ipa_sync_server'), + json={'method': 'user_mod', + 'params':[ + [user_name], + {'userpassword': password} + ], + 'id': 0}, + verify=config.get('ipa_sync_certfile'), + cookies=c.cookies, + headers={'referer': + 'https://%s/ipa' + % config.get('ipa_sync_server')}).json() + if r['error'] is not None: + log.error('Error syncing password for %s: %s' % (user_name, + r['error'])) + raise Exception('Error syncing password') + + @expose(template="fas.templates.user.resetpass") + def resetpass(self): + ''' Prompt user to reset password + + :returns: empty dict + ''' + if identity.not_anonymous(): + turbogears.flash(_('You are already logged in!')) + turbogears.redirect('/user/view/%s' % identity.current.user_name) + return dict() + + @expose(template="fas.templates.user.resetpass") + def sendtoken(self, username, email, encrypted=False): + ''' Email token to user for password reset + + :arg username: username of user for verification + :arg email: email of user for verification + :arg encrypted: Should we encrypt the password + :returns: empty dict + ''' + # Candidate for a validator later + username = username.lower() + email = email.lower() + if identity.current.user_name: + turbogears.flash(_("You are already logged in.")) + turbogears.redirect('/user/view/%s' % identity.current.user_name) + return dict() + try: + person = People.by_username(username) + except InvalidRequestError: + turbogears.flash(_('Username email combo does not exist!')) + turbogears.redirect('/user/resetpass') + + if email != person.email.lower(): + turbogears.flash(_("username + email combo unknown.")) + return dict() + if person.status in disabled_statuses: + turbogears.flash(_("Your account currently has status " + \ + "%(status)s. For more information, please contact " + \ + "%(admin_email)s") % \ + {'status': person.status, + 'admin_email': config.get('accounts_email')}) + return dict() + if person.status == ('bot'): + turbogears.flash(_('System accounts cannot have their ' + \ + 'passwords reset online. Please contact %(admin_email)s ' + \ + 'to have it reset') % \ + {'admin_email': config.get('accounts_email')}) + reset_subject = _('Warning: attempted reset of system account') + reset_text = _(''' +Warning: Someone attempted to reset the password for system account +%(account)s via the web interface. +''') % {'account': username} + send_mail(config.get('accounts_email'), reset_subject, reset_text) + return dict() + + token_charset = string.ascii_letters + string.digits + token = random_string(token_charset, 32) + mail = _(''' +Somebody (hopefully you) has requested a password reset for your account! +To change your password (or to cancel the request), please visit + +%(verifyurl)s/accounts/user/verifypass/%(user)s/%(token)s +''') % {'verifyurl' : config.get('base_url_filter.base_url').rstrip('/'), + 'user': username, 'token': token} + if encrypted: + # TODO: Move this out to mail function + # think of how to make sure this doesn't get + # full of random keys (keep a clean Fedora keyring) + # TODO: MIME stuff? + keyid = re.sub('\s', '', person.gpg_keyid) + if not keyid: + turbogears.flash(_("This user does not have a GPG Key ID " +\ + "set, so an encrypted email cannot be sent.")) + return dict() + ret = subprocess.call([config.get('gpgexec'), '--keyserver', + config.get('gpg_keyserver'), '--recv-keys', keyid]) + if ret != 0: + turbogears.flash(_( + "Your key could not be retrieved from subkeys.pgp.net")) + turbogears.redirect('/user/resetpass') + return dict() + else: + try: + # This may not be the neatest fix, but gpgme gave an error + # when mail was unicode. + plaintext = StringIO.StringIO(mail.encode('utf-8')) + ciphertext = StringIO.StringIO() + ctx = gpgme.Context() + ctx.armor = True + signer = ctx.get_key(re.sub('\s', '', + config.get('gpg_fingerprint'))) + ctx.signers = [signer] + recipient = ctx.get_key(keyid) + def passphrase_cb(uid_hint, passphrase_info, + prev_was_bad, file_d): + ''' Get gpg passphrase ''' + os.write(file_d, '%s\n' % config.get('gpg_passphrase')) + ctx.passphrase_cb = passphrase_cb + ctx.encrypt_sign([recipient], + gpgme.ENCRYPT_ALWAYS_TRUST, + plaintext, + ciphertext) + mail = ciphertext.getvalue() + except: + turbogears.flash(_( + 'Your password reset email could not be encrypted.')) + return dict() + send_mail(email, _('RPM Fusion Project Password Reset'), mail) + person.passwordtoken = token + Log(author_id=person.id, + description='Password reset sent for %s' % person.username) + turbogears.flash(_('A password reset URL has been emailed to you.')) + turbogears.redirect('/login') + return dict() + + @error_handler(error) # pylint: disable-msg=E0602 + @expose(template="fas.templates.user.verifypass") + @validate(validators={'username' : KnownUser}) + def verifypass(self, username, token, cancel=False): + ''' Verifies whether or not the user has a password change request + + :arg username: username of person to password change + :arg token: Token to check + :arg cancel: Whether or not to cancel the request + :returns: empty dict + ''' + + person = People.by_username(username) + if person.status in disabled_statuses: + turbogears.flash(_("Your account currently has status " + \ + "%(status)s. For more information, please contact " + \ + "%(admin_email)s") % {'status': person.status, + 'admin_email': config.get('accounts_email')}) + return dict() + if not person.passwordtoken: + turbogears.flash(_("You don't have any pending password changes.")) + turbogears.redirect('/login') + return dict() + if person.passwordtoken != token: + turbogears.flash(_('Invalid password change token.')) + turbogears.redirect('/login') + return dict() + if cancel: + person.passwordtoken = '' + Log(author_id=person.id, + description='Password reset cancelled for %s' % + person.username) + turbogears.flash(_('Your password reset has been canceled. ' + \ + 'The password change token has been invalidated.')) + turbogears.redirect('/login') + return dict() + person = person.filter_private() + return dict(person=person, token=token) + + @error_handler(error) # pylint: disable-msg=E0602 + @expose(template="fas.templates.user.verifypass") + @validate(validators=UserResetPassword()) + def setnewpass(self, username, token, password, passwordcheck): + ''' Sets a new password for a user + + :arg username: Username of user to change password + :arg token: sanity check token + :arg password: new plain text password + :arg passwordcheck: must match password + + :returns: empty dict or error + ''' + person = People.by_username(username) + changed = [] # Field names updated to emit via fedmsg + + # Note: the following check should be done by the validator. It's + # here because of a bug in older formencode that caused chained + # validators to not fire. + if password != passwordcheck: + turbogears.flash(_("Both passwords must match")) + return dict() + + if person.status in disabled_statuses: + turbogears.flash(_("Your account currently has status " + \ + "%(status)s. For more information, please contact " + \ + "%(admin_email)s") % \ + {'status': person.status, + 'admin_email': config.get('accounts_email')}) + return dict() + + if not person.passwordtoken: + turbogears.flash(_('You do not have any pending password changes.')) + turbogears.redirect('/login') + return dict() + + if person.passwordtoken != token: + person.emailtoken = '' + turbogears.flash(_('Invalid password change token.')) + turbogears.redirect('/login') + return dict() + + # Re-enabled! + if person.status in ('inactive'): + # Check that the password has changed. + if (person.old_password and + crypt.crypt(password.encode('utf-8'), person.old_password) + == person.old_password) or ( + person.password and + self.crypted_password_re.match(person.password) and + crypt.crypt(password.encode('utf-8'), person.password) + == person.password): + turbogears.flash(_('Your password can not be the same ' + \ + 'as your old password.')) + return dict(person=person, token=token) + + person.status = 'active' + person.status_change = datetime.now(pytz.utc) + changed.append('status') + + # Log the change + newpass = generate_password(password) + person.old_password = person.password + person.password = newpass['hash'] + person.password_changed = datetime.now(pytz.utc) + person.passwordtoken = '' + changed.append('password') + Log(author_id=person.id, description='Password changed') + session.flush() + + turbogears.flash(_('You have successfully reset your password. ' + \ + 'You should now be able to login below.')) + fas.fedmsgshim.send_message(topic="user.update", msg={ + 'agent': person.username, + 'user': person.username, + 'fields': changed, + }) + turbogears.redirect('/login') + return dict() + + @identity.require(identity.not_anonymous()) + @expose(template="fas.templates.user.gencert") + def gencert(self): + ''' Displays a simple text link to users to click to actually get a + certificate + + :returns: empty dict + ''' + return dict() + + @identity.require(identity.not_anonymous()) + @expose(template="genshi:fas.templates.user.gencertdisabled", + allow_json=True, content_type='text/html') + @expose(template="genshi-text:fas.templates.user.cert", format="text", + content_type='application/x-x509-user-cert', allow_json=True) + def dogencert(self): + ''' Generates a user certificate + + :returns: empty dict though via tg it returns an x509 cert''' + from cherrypy import response + if not config.get('gencert', False): + # Certificate generation is disabled on this machine + # Return the error page + return dict() + import tempfile + username = identity.current.user_name + person = People.by_username(username) + if not cla_done(person): + if self.json_request(): + return dict(cla=False) + turbogears.flash(_('Before generating a certificate, you must ' + \ + 'first complete the FPCA.')) + turbogears.redirect('/fpca/') + return dict() + + response.headers["content-disposition"] = "attachment" + pkey = openssl_fas.createKeyPair(openssl_fas.TYPE_RSA, 2048) + + digest = config.get('openssl_digest') + + req = openssl_fas.createCertRequest(pkey, digest=digest, + C=config.get('openssl_c'), + ST=config.get('openssl_st'), + L=config.get('openssl_l'), + O=config.get('openssl_o'), + OU=config.get('openssl_ou'), + CN=person.username, + emailAddress=person.email, + ) + + reqdump = crypto.dump_certificate_request(crypto.FILETYPE_PEM, req) + certdump = '' + + while True: + try: + os.mkdir(os.path.join(config.get('openssl_lockdir'), 'lock')) + break + except OSError: + time.sleep(0.75) + + try: + reqfile = tempfile.NamedTemporaryFile() + reqfile.write(reqdump) + reqfile.flush() + + indexfile = open(config.get('openssl_ca_index')) + for entry in indexfile: + attrs = entry.split('\t') + if attrs[0] != 'V': + continue + # the index line looks something like this: + # R\t090816180424Z\t080816190734Z\t01\tunknown\t/C=US/ST=Pennsylvania/O=Fedora/CN=test1/emailAddress=rickyz(a)cmu.edu + # V\t090818174940Z\t\t01\tunknown\t/C=US/ST=North Carolina/O=Fedora Project/OU=Upload Files/CN=toshio/emailAddress=badger(a)clingman.lan + distinguished_name = attrs[5] + serial = attrs[3] + info = {} + for pair in distinguished_name.split('/'): + if pair: + key, value = pair.split('=') + info[key] = value + if info['CN'] == person.username: + # revoke old certs + subprocess.call([config.get('makeexec'), '-C', + config.get('openssl_ca_dir'), 'revoke', + 'cert=%s/%s' % (config.get('openssl_ca_newcerts'), + serial + '.pem')]) + + certfile = tempfile.NamedTemporaryFile() + command = [config.get('makeexec'), '-C', + config.get('openssl_ca_dir'), 'sign', + 'req=%s' % reqfile.name, 'cert=%s' % certfile.name] + ret = subprocess.call(command) + reqfile.close() + + certdump = certfile.read() + certfile.close() + finally: + os.rmdir(os.path.join(config.get('openssl_lockdir'), 'lock')) + + if ret != 0: + turbogears.flash(_('Your certificate could not be generated.')) + turbogears.redirect('/home') + return dict() + keydump = crypto.dump_privatekey(crypto.FILETYPE_PEM, pkey) + cherrypy.request.headers['Accept'] = 'text' + + gencert_subject = _('A new certificate has been generated for %s') % \ + person.username + gencert_text = _(''' +You have generated a new SSL certificate. If you did not request this, +please cc root(a)rpmfusion.org and let them know. + +Note that certificates generated prior to the current one have been +automatically revoked, and should stop working within the hour. +''') + send_mail(person.email, gencert_subject, gencert_text) + Log(author_id=person.id, description='Certificate generated for %s' % + person.username) + fas.fedmsgshim.send_message(topic="user.update", msg={ + 'agent': person.username, + 'user': person.username, + 'fields': ['certificate'], + }) + return dict(tg_template="genshi-text:fas.templates.user.cert", + cla=True, cert=certdump, key=keydump) + + @identity.require(identity.in_group( + config.get('systemgroup', 'fas-system'))) + @expose(allow_json=True) + def update_last_seen(self, username, last_seen=None): + ''' Update the persons last_seen field in the database + + :arg username: Username of the person to update + :arg last_seen: Specify the time they were last seen, else now + Format should be string: YYYY,MM,DD,hh,mm,ss + :returns: Empty dict on success + ''' + + if not last_seen: + last_seen = datetime.now(pytz.utc) + else: + update_time = last_seen.split(',') + last_seen = datetime(int(update_time[0]), # Year + int(update_time[1]), # Month + int(update_time[2]), # Day + int(update_time[3]), # Hour + int(update_time[4]), # Minute + int(update_time[5]), # Second + 0, # ms + pytz.utc) # tz + person = People.by_username(username) + print "LAST_SEEN: %s" % last_seen + person.last_seen = last_seen + session.flush() + return dict() + + @identity.require(identity.not_anonymous()) + @expose() + def clearkey(self): + username = identity.current.user_name + person = People.by_username(username) + person.ssh_key = '' + fas.fedmsgshim.send_message(topic="user.update", msg={ + 'agent': person.username, + 'user': person.username, + 'fields': ['ssh_key'], + }) + turbogears.flash(_('Your key has been removed.')) + turbogears.redirect('/user/view/%s' % username) + return dict()

8 years, 1 month

1
0
0 / 0

[ansible] Add ssl_protocols ssl_ciphers

by Nicolas Chauvet

commit 38b71fea0d25900415c1ae3b81b08fa6e296b586 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Thu Nov 3 15:46:51 2016 +0100 Add ssl_protocols ssl_ciphers files/httpd/newvirtualhost.conf.j2 | 5 +- roles/koji_hub/files/koji-ssl.conf | 226 ------------------------------------ roles/koji_hub/tasks/main.yml | 2 +- vars/global.yml | 5 +- 4 files changed, 7 insertions(+), 231 deletions(-) --- diff --git a/files/httpd/newvirtualhost.conf.j2 b/files/httpd/newvirtualhost.conf.j2 index 18c7a2e..a00dd53 100644 --- a/files/httpd/newvirtualhost.conf.j2 +++ b/files/httpd/newvirtualhost.conf.j2 @@ -15,13 +15,12 @@ # SSL Protocol support: # List the enable protocol levels with which clients will be able to # connect. Disable SSLv2 access by default: - SSLProtocol all -SSLv2 + SSLProtocol {{ ssl_protocols }} # SSL Cipher Suite: # List the ciphers that the client is permitted to negotiate. # See the mod_ssl documentation for a complete list. - #SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW - SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5 + SSLCipherSuite {{ ssl_ciphers }} # Server Certificate: # Point SSLCertificateFile at a PEM encoded certificate. If diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index 258da56..81c23d5 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -255,7 +255,7 @@ when: env == "staging" - name: koji staging ssl config - copy: src=koji-ssl.conf.stg dest=/etc/httpd/conf.d/ssl.conf + template: src=koji-ssl.conf.stg dest=/etc/httpd/conf.d/ssl.conf tags: - config - koji_hub diff --git a/vars/global.yml b/vars/global.yml index 0510713..f889225 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -44,9 +44,12 @@ centos66_x86_64: CentOS-6-x86_64-GenericCloud-20141129_01 rhel70_x86_64: rhel-guest-image-7.0-20140930.0.x86_64 rhel66_x86_64: rhel-guest-image-6.6-20141222.0.x86_64 +ssl_protocols: "-All +TLSv1 +TLSv1.1 +TLSv1.2" +ssl_ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK" + # Set a default hostname base to transient. Override in host vars or command line. hostbase: transient -global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients', +global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients', 'patch', 'postfix', 'rsync', 'strace', 'tmpwatch', 'traceroute', 'vim-enhanced', 'xz', 'zsh', 'libselinux-python', 'ntpdate', 'bash-completion', 'telnet',

8 years, 1 month

1
0
0 / 0

[ansible] Sync koji-hub - Disable login

by Nicolas Chauvet

commit b584d191e5fdb46a538cd21fa9ac2d06978a70a8 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Thu Nov 3 15:22:53 2016 +0100 Sync koji-hub - Disable login roles/koji_hub/files/koji-directory-cleanup | 6 +- roles/koji_hub/templates/fedmsg-koji-plugin.py | 30 +++- roles/koji_hub/templates/koji-ssl.conf | 226 ++++++++++++++++++++++++ roles/koji_hub/templates/web.conf.j2 | 1 + 4 files changed, 259 insertions(+), 4 deletions(-) --- diff --git a/roles/koji_hub/files/koji-directory-cleanup b/roles/koji_hub/files/koji-directory-cleanup index 4429235..0d53299 100644 --- a/roles/koji_hub/files/koji-directory-cleanup +++ b/roles/koji_hub/files/koji-directory-cleanup @@ -1,3 +1,3 @@ -0 8 * * * apache find /mnt/koji/work -xdev -depth -mindepth 2 -mtime +14 $ -type f -o -type l $ -delete -o -type d -empty -delete -0 9 * * * apache find /mnt/koji/scratch -xdev -depth -mtime +14 $ -type f -o -type l $ -delete -o -type d -empty -delete -0 9 * * * apache find /mnt/koji/scratch/koschei -xdev -depth -mtime +1 $ -type f -o -type l $ -delete -o -type d -empty -delete +0 8 * * * apache find /mnt/koji/work -xdev -depth -mindepth 2 -mtime +14 $ -type f -o -type l $ -delete -o -type d -empty -delete >& /dev/null +0 9 * * * apache find /mnt/koji/scratch -xdev -depth -mtime +14 $ -type f -o -type l -o -not -path "./koschei" $ -delete -o -type d -empty -delete >& /dev/null +0 15 * * * apache find /mnt/koji/scratch/koschei -xdev -depth -mtime +1 $ -type f -o -type l $ -delete -o -type d -empty -delete >& /dev/null diff --git a/roles/koji_hub/templates/fedmsg-koji-plugin.py b/roles/koji_hub/templates/fedmsg-koji-plugin.py index 0f95fca..2ba4ffc 100644 --- a/roles/koji_hub/templates/fedmsg-koji-plugin.py +++ b/roles/koji_hub/templates/fedmsg-koji-plugin.py @@ -5,6 +5,7 @@ # Ralph Bean <rbean(a)redhat.com> # Mike Bonnet <mikeb(a)redhat.com> +from koji.context import context from koji.plugin import callbacks from koji.plugin import callback from koji.plugin import ignore_error @@ -73,6 +74,12 @@ def get_message_body(topic, *args, **kws): msg['build_id'] = info.get('id', None) msg['task_id'] = info.get('task_id', None) + if msg['task_id']: + task = kojihub.Task(msg['task_id']) + msg['request'] = task.getRequest() + else: + msg['request'] = None + if 'owner_name' in info: msg['owner'] = info['owner_name'] elif 'owner_id' in info: @@ -118,10 +125,13 @@ def get_message_body(topic, *args, **kws): c for c in callbacks.keys() if c.startswith('post') and c not in [ 'postImport', # This is kind of useless; also noisy. + # This one is special, and is called every time, so ignore it. + # Added here https://pagure.io/koji/pull-request/148 + 'postCommit', ] ]) @ignore_error -def send_message(cbtype, *args, **kws): +def queue_message(cbtype, *args, **kws): if cbtype.startswith('post'): msgtype = cbtype[4:] else: @@ -169,4 +179,22 @@ def send_message(cbtype, *args, **kws): body = scrub(body) +{% if env != 'staging' %} + # Send the messages immediately. fedmsg.publish(topic=topic, msg=body, modname='buildsys') +{% else %} + # Queue the message for later. + # It will only get sent after postCommit is called. + messages = getattr(context, 'fedmsg_plugin_messages', []) + messages.append(dict(topic=topic, msg=body, modname='buildsys')) + context.fedmsg_plugin_messages = messages + + +# Meanwhile, postCommit actually sends messages. +@callback('postCommit') +@ignore_error +def send_messages(cbtype, *args, **kws): + messages = getattr(context, 'fedmsg_plugin_messages', []) + for message in messages: + fedmsg.publish(**message) +{% endif %} diff --git a/roles/koji_hub/templates/koji-ssl.conf b/roles/koji_hub/templates/koji-ssl.conf new file mode 100644 index 0000000..47a08d6 --- /dev/null +++ b/roles/koji_hub/templates/koji-ssl.conf @@ -0,0 +1,226 @@ +# +# When we also provide SSL we have to listen to the +# the HTTPS port in addition. +# +Listen 443 https + +## +## SSL Global Context +## +## All SSL configuration in this context applies both to +## the main server and all SSL-enabled virtual hosts. +## + +# Pass Phrase Dialog: +# Configure the pass phrase gathering process. +# The filtering dialog program (`builtin' is a internal +# terminal dialog) has to provide the pass phrase on stdout. +SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog + +# Inter-Process Session Cache: +# Configure the SSL Session Cache: First the mechanism +# to use and second the expiring timeout (in seconds). +SSLSessionCache shmcb:/run/httpd/sslcache(1024000) +SSLSessionCacheTimeout 600 + +# Pseudo Random Number Generator (PRNG): +# Configure one or more sources to seed the PRNG of the +# SSL library. The seed data should be of good random quality. +# WARNING! On some platforms /dev/random blocks if not enough entropy +# is available. This means you then cannot use the /dev/random device +# because it would lead to very long connection times (as long as +# it requires to make more entropy available). But usually those +# platforms additionally provide a /dev/urandom device which doesn't +# block. So, if available, use this one instead. Read the mod_ssl User +# Manual for more details. +SSLRandomSeed startup file:/dev/urandom 256 +SSLRandomSeed connect builtin +#SSLRandomSeed startup file:/dev/random 512 +#SSLRandomSeed connect file:/dev/random 512 +#SSLRandomSeed connect file:/dev/urandom 512 + +# +# Use "SSLCryptoDevice" to enable any supported hardware +# accelerators. Use "openssl engine -v" to list supported +# engine names. NOTE: If you enable an accelerator and the +# server does not start, consult the error logs and ensure +# your accelerator is functioning properly. +# +SSLCryptoDevice builtin +#SSLCryptoDevice ubsec + +## +## SSL Virtual Host Context +## + +<VirtualHost _default_:443> + +# General setup for the virtual host, inherited from global configuration +#DocumentRoot "/var/www/html" +#ServerName www.example.com:443 + +# Use separate log files for the SSL virtual host; note that LogLevel +# is not inherited from httpd.conf. +ErrorLog logs/ssl_error_log +TransferLog logs/ssl_access_log +LogLevel warn + +# SSL Engine Switch: +# Enable/Disable SSL for this virtual host. +SSLEngine on + +# SSL Protocol support: +# List the enable protocol levels with which clients will be able to +# connect. Disable SSLv2 access by default: +SSLProtocol {{ ssl_protocols }} + +# SSL Cipher Suite: +# List the ciphers that the client is permitted to negotiate. +# See the mod_ssl documentation for a complete list. +SSLCipherSuite {{ ssl_ciphers }} + +# Speed-optimized SSL Cipher configuration: +# If speed is your main concern (on busy HTTPS servers e.g.), +# you might want to force clients to specific, performance +# optimized ciphers. In this case, prepend those ciphers +# to the SSLCipherSuite list, and enable SSLHonorCipherOrder. +# Caveat: by giving precedence to RC4-SHA and AES128-SHA +# (as in the example below), most connections will no longer +# have perfect forward secrecy - if the server's key is +# compromised, captures of past or future traffic must be +# considered compromised, too. +#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5 +#SSLHonorCipherOrder on + +# Server Certificate: +# Point SSLCertificateFile at a PEM encoded certificate. If +# the certificate is encrypted, then you will be prompted for a +# pass phrase. Note that a kill -HUP will prompt again. A new +# certificate can be generated using the genkey(1) command. +#SSLCertificateFile /etc/pki/tls/certs/localhost.crt +SSLCertificateFile /etc/pki/tls/certs/koji_cert.pem + +# Server Private Key: +# If the key is not combined with the certificate, use this +# directive to point at the key file. Keep in mind that if +# you've both a RSA and a DSA private key you can configure +# both in parallel (to also allow the use of DSA ciphers, etc.) +#SSLCertificateKeyFile /etc/pki/tls/private/localhost.key +SSLCertificateKeyFile /etc/pki/tls/private/koji_key.pem + +# Server Certificate Chain: +# Point SSLCertificateChainFile at a file containing the +# concatenation of PEM encoded CA certificates which form the +# certificate chain for the server certificate. Alternatively +# the referenced file can be the same as SSLCertificateFile +# when the CA certificates are directly appended to the server +# certificate for convinience. +#SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt +SSLCertificateChainFile /etc/pki/tls/certs/extras_cacert.pem + +# Certificate Authority (CA): +# Set the CA certificate verification path where to find CA +# certificates for client authentication or alternatively one +# huge file containing all of them (file must be PEM encoded) +#SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt +SSLCACertificateFile /etc/pki/tls/certs/extras_upload_cacert.pem + +#SSLCARevocationFile /etc/pki/tls/crl.pem +#SSLCARevocationCheck chain + +# Client Authentication (Type): +# Client certificate verification type and depth. Types are +# none, optional, require and optional_no_ca. Depth is a +# number which specifies how deeply to verify the certificate +# issuer chain before deciding the certificate is not valid. +#SSLVerifyClient require +#SSLVerifyDepth 10 + +# Access Control: +# With SSLRequire you can do per-directory access control based +# on arbitrary complex boolean expressions containing server +# variable checks and other lookup directives. The syntax is a +# mixture between C and Perl. See the mod_ssl documentation +# for more details. +#<Location /> +#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ +# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ +# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ +# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ +# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ +# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ +#</Location> + +# SSL Engine Options: +# Set various options for the SSL engine. +# o FakeBasicAuth: +# Translate the client X.509 into a Basic Authorisation. This means that +# the standard Auth/DBMAuth methods can be used for access control. The +# user name is the `one line' version of the client's X.509 certificate. +# Note that no password is obtained from the user. Every entry in the user +# file needs this password: `xxj31ZMTZzkVA'. +# o ExportCertData: +# This exports two additional environment variables: SSL_CLIENT_CERT and +# SSL_SERVER_CERT. These contain the PEM-encoded certificates of the +# server (always existing) and the client (only existing when client +# authentication is used). This can be used to import the certificates +# into CGI scripts. +# o StdEnvVars: +# This exports the standard SSL/TLS related `SSL_*' environment variables. +# Per default this exportation is switched off for performance reasons, +# because the extraction step is an expensive operation and is usually +# useless for serving static content. So one usually enables the +# exportation for CGI and SSI requests only. +# o StrictRequire: +# This denies access when "SSLRequireSSL" or "SSLRequire" applied even +# under a "Satisfy any" situation, i.e. when it applies access is denied +# and no other module can change it. +# o OptRenegotiate: +# This enables optimized SSL connection renegotiation handling when SSL +# directives are used in per-directory context. +#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire +<Files ~ "\.(cgi|shtml|phtml|php3?)$"> + SSLOptions +StdEnvVars +</Files> +<Directory "/var/www/cgi-bin"> + SSLOptions +StdEnvVars +</Directory> + +# SSL Protocol Adjustments: +# The safe and default but still SSL/TLS standard compliant shutdown +# approach is that mod_ssl sends the close notify alert but doesn't wait for +# the close notify alert from client. When you need a different shutdown +# approach you can use one of the following variables: +# o ssl-unclean-shutdown: +# This forces an unclean shutdown when the connection is closed, i.e. no +# SSL close notify alert is send or allowed to received. This violates +# the SSL/TLS standard but is needed for some brain-dead browsers. Use +# this when you receive I/O errors because of the standard approach where +# mod_ssl sends the close notify alert. +# o ssl-accurate-shutdown: +# This forces an accurate shutdown when the connection is closed, i.e. a +# SSL close notify alert is send and mod_ssl waits for the close notify +# alert of the client. This is 100% SSL/TLS standard compliant, but in +# practice often causes hanging connections with brain-dead browsers. Use +# this only for browsers where you know that their SSL implementation +# works correctly. +# Notice: Most problems of broken clients are also related to the HTTP +# keep-alive facility, so you usually additionally want to disable +# keep-alive for those clients, too. Use variable "nokeepalive" for this. +# Similarly, one has to force some clients to use HTTP/1.0 to workaround +# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and +# "force-response-1.0" for this. +BrowserMatch "MSIE [2-5]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + +# Per-Server Logging: +# The home of a custom SSL log file. Use this when you want a +# compact non-error SSL logfile on a virtual host basis. +CustomLog logs/ssl_request_log \ + "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" + +RewriteEngine on +RewriteRule ^/$ /koji [R,L] +</VirtualHost> + diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2 index 833e324..d16491a 100644 --- a/roles/koji_hub/templates/web.conf.j2 +++ b/roles/koji_hub/templates/web.conf.j2 @@ -29,3 +29,4 @@ Secret = {{ kojiSecret }} LibPath = /usr/share/koji-web/lib +loginDisabled = True

8 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

sysadmin-notify November 2016