25625107b6
User table columns (is_admin, status, email_verified) and making sure that
their functionality is instead completely handled by privileges. I also worked
on the meta pages which I hope to finish soon. I set up migrations to ensure
the default privileges are given to users that should have them. Lastly, I made
it so that banned users can log out.
===============================================================================
Made Sure the Vestigial Columns of the User Table were not being Used
===============================================================================
--\ mediagoblin/auth/views.py
--\ mediagoblin/db/models.py
--\ mediagoblin/templates/mediagoblin/base.html
--\ mediagoblin/templates/mediagoblin/moderation/user.html
--\ mediagoblin/templates/mediagoblin/user_pages/collection_lis$
--\ mediagoblin/templates/mediagoblin/user_pages/user.html
--\ mediagoblin/tests/test_auth.py
--\ mediagoblin/tests/test_persona.py
--\ mediagoblin/user_pages/views.py
===============================================================================
Wrote the Migrations to Set up the Default Privileges
===============================================================================
--\ mediagoblin/db/migrations.py
--\ mediagoblin/gmg_commands/users.py
===============================================================================
Work on the Meta Pages
===============================================================================
--\ mediagoblin/meta/routing.py
--\ mediagoblin/meta/views.py
--\ mediagoblin/static/css/base.css
--\ mediagoblin/templates/mediagoblin/meta/terms_of_service.html
===============================================================================
Small Changes
===============================================================================
--\ mediagoblin/templates/mediagoblin/base.html
--| Benevolently made it so that banned users can log out
===============================================================================
X X X X X X X X X X X X X X X X X X X X
===============================================================================
118 lines
3.8 KiB
Python
118 lines
3.8 KiB
Python
# GNU MediaGoblin -- federated, autonomous media hosting
|
|
# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU Affero General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Affero General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
from mediagoblin.gmg_commands import util as commands_util
|
|
from mediagoblin import auth
|
|
from mediagoblin import mg_globals
|
|
|
|
def adduser_parser_setup(subparser):
|
|
subparser.add_argument(
|
|
'--username','-u',
|
|
help="Username used to login")
|
|
subparser.add_argument(
|
|
'--password','-p',
|
|
help="Your supersecret word to login, beware of storing it in bash history")
|
|
subparser.add_argument(
|
|
'--email','-e',
|
|
help="Email to receive notifications")
|
|
|
|
|
|
def adduser(args):
|
|
#TODO: Lets trust admins this do not validate Emails :)
|
|
commands_util.setup_app(args)
|
|
|
|
args.username = commands_util.prompt_if_not_set(args.username, "Username:")
|
|
args.password = commands_util.prompt_if_not_set(args.password, "Password:",True)
|
|
args.email = commands_util.prompt_if_not_set(args.email, "Email:")
|
|
|
|
db = mg_globals.database
|
|
users_with_username = \
|
|
db.User.query.filter_by(
|
|
username=args.username.lower()
|
|
).count()
|
|
|
|
if users_with_username:
|
|
print u'Sorry, a user with that name already exists.'
|
|
|
|
else:
|
|
# Create the user
|
|
entry = db.User()
|
|
entry.username = unicode(args.username.lower())
|
|
entry.email = unicode(args.email)
|
|
entry.pw_hash = auth.gen_password_hash(args.password)
|
|
default_privileges = [
|
|
db.Privilege.query.filter(
|
|
db.Privilege.privilege_name==u'commenter').one(),
|
|
db.Privilege.query.filter(
|
|
db.Privilege.privilege_name==u'uploader').one(),
|
|
db.Privilege.query.filter(
|
|
db.Privilege.privilege_name==u'reporter').one(),
|
|
db.Privilege.query.filter(
|
|
db.Privilege.privilege_name==u'active').one()
|
|
]
|
|
entry.all_privileges = default_privileges
|
|
entry.save()
|
|
|
|
print "User created (and email marked as verified)"
|
|
|
|
|
|
def makeadmin_parser_setup(subparser):
|
|
subparser.add_argument(
|
|
'username',
|
|
help="Username to give admin level")
|
|
|
|
|
|
def makeadmin(args):
|
|
commands_util.setup_app(args)
|
|
|
|
db = mg_globals.database
|
|
|
|
user = db.User.query.filter_by(
|
|
username=unicode(args.username.lower())).one()
|
|
if user:
|
|
user.all_privileges.append(
|
|
db.Privilege.query.filter(
|
|
db.Privilege.privilege_name==u'admin').one()
|
|
)
|
|
user.save()
|
|
print 'The user is now Admin'
|
|
else:
|
|
print 'The user doesn\'t exist'
|
|
|
|
|
|
def changepw_parser_setup(subparser):
|
|
subparser.add_argument(
|
|
'username',
|
|
help="Username used to login")
|
|
subparser.add_argument(
|
|
'password',
|
|
help="Your NEW supersecret word to login")
|
|
|
|
|
|
def changepw(args):
|
|
commands_util.setup_app(args)
|
|
|
|
db = mg_globals.database
|
|
|
|
user = db.User.query.filter_by(
|
|
username=unicode(args.username.lower())).one()
|
|
if user:
|
|
user.pw_hash = auth.gen_password_hash(args.password)
|
|
user.save()
|
|
print 'Password successfully changed'
|
|
else:
|
|
print 'The user doesn\'t exist'
|