Skip to content

Commit

Permalink
Merge branch 'master' into 3196-common-url_for
Browse files Browse the repository at this point in the history
  • Loading branch information
@amercader
amercader committed Apr 10, 2017
2 parents da2dcdd + 9c1ec8b commit 1bd499e
Show file tree
Hide file tree
Showing 39 changed files with 8,283 additions and 7,850 deletions.
2 changes: 1 addition & 1 deletion README.rst
View file
Expand Up @@ -74,7 +74,7 @@ others, make a new page on the `CKAN wiki`_, and tell us about it on
Copying and License
-------------------

This material is copyright (c) 2006-2014 Open Knowledge Foundation.
This material is copyright (c) 2006-2017 Open Knowledge International and contributors.

It is open and licensed under the GNU Affero General Public License (AGPL) v3.0
whose full text may be found at:
Expand Down
1 change: 1 addition & 0 deletions ckan/config/deployment.ini_tmpl
View file
Expand Up @@ -159,6 +159,7 @@ ckan.feeds.author_link =

#ckan.datapusher.formats = csv xls xlsx tsv application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
#ckan.datapusher.url = http://127.0.0.1:8800/
#ckan.datapusher.assume_task_stale_after = 3600

# Resource Proxy settings
# Preview size limit, default: 1MB
Expand Down
2 changes: 1 addition & 1 deletion ckan/config/middleware/flask_app.py
View file
Expand Up @@ -12,7 +12,6 @@
from werkzeug.exceptions import HTTPException
from werkzeug.routing import Rule

from flask_debugtoolbar import DebugToolbarExtension

from beaker.middleware import SessionMiddleware
from paste.deploy.converters import asbool
Expand Down Expand Up @@ -69,6 +68,7 @@ def make_flask_stack(conf, **app_conf):
' with the SECRET_KEY config option')

if debug:
from flask_debugtoolbar import DebugToolbarExtension
app.config['DEBUG_TB_INTERCEPT_REDIRECTS'] = False
DebugToolbarExtension(app)

Expand Down
256 changes: 160 additions & 96 deletions ckan/lib/cli.py
View file
Expand Up @@ -20,6 +20,7 @@
import paste.script
from paste.registry import Registry
from paste.script.util.logging_config import fileConfig
import click

import ckan.logic as logic
import ckan.model as model
Expand Down Expand Up @@ -85,6 +86,54 @@ def parse_db_config(config_key='sqlalchemy.url'):
return db_details


def user_add(args):
'''Add new user if we use paster sysadmin add
or paster user add
'''
if len(args) < 2:
error('Need name and email of the user.')
username = args[0]

# parse args into data_dict
data_dict = {'name': username}
for arg in args[1:]:
try:
field, value = arg.split('=', 1)
data_dict[field] = value
except ValueError:
raise ValueError(
'Could not parse arg: %r (expected "<option>=<value>)"' % arg
)

if 'password' not in data_dict:
data_dict['password'] = UserCmd.password_prompt()

if 'fullname' in data_dict:
data_dict['fullname'] = data_dict['fullname'].decode(
sys.getfilesystemencoding()
)

print('Creating user: %r' % username)

try:
import ckan.logic as logic
import ckan.model as model
site_user = logic.get_action('get_site_user')({
'model': model,
'ignore_auth': True},
{}
)
context = {
'model': model,
'session': model.Session,
'ignore_auth': True,
'user': site_user['name'],
}
user_dict = logic.get_action('user_create')(context, data_dict)
pprint(user_dict)
except logic.ValidationError, e:
error(traceback.format_exc())

## from http://code.activestate.com/recipes/577058/ MIT licence.
## Written by Trent Mick
def query_yes_no(question, default="yes"):
Expand Down Expand Up @@ -133,71 +182,125 @@ def ungettext(self, singular, plural, n):
return singular


def _get_config(config=None):
from paste.deploy import appconfig

if config:
filename = os.path.abspath(config)
config_source = '-c parameter'
elif os.environ.get('CKAN_INI'):
filename = os.environ.get('CKAN_INI')
config_source = '$CKAN_INI'
else:
default_filename = 'development.ini'
filename = os.path.join(os.getcwd(), default_filename)
if not os.path.exists(filename):
# give really clear error message for this common situation
msg = 'ERROR: You need to specify the CKAN config (.ini) '\
'file path.'\
'\nUse the --config parameter or set environment ' \
'variable CKAN_INI or have {}\nin the current directory.' \
.format(default_filename)
exit(msg)

if not os.path.exists(filename):
msg = 'Config file not found: %s' % filename
msg += '\n(Given by: %s)' % config_source
exit(msg)

fileConfig(filename)
return appconfig('config:' + filename)


def load_config(config, load_site_user=True):
conf = _get_config(config)
assert 'ckan' not in dir() # otherwise loggers would be disabled
# We have now loaded the config. Now we can import ckan for the
# first time.
from ckan.config.environment import load_environment
load_environment(conf.global_conf, conf.local_conf)

registry = Registry()
registry.prepare()
import pylons
registry.register(pylons.translator, MockTranslator())

if model.user_table.exists() and load_site_user:
# If the DB has already been initialized, create and register
# a pylons context object, and add the site user to it, so the
# auth works as in a normal web request
c = pylons.util.AttribSafeContextObj()

registry.register(pylons.c, c)

site_user = logic.get_action('get_site_user')({'ignore_auth': True}, {})

pylons.c.user = site_user['name']
pylons.c.userobj = model.User.get(site_user['name'])

## give routes enough information to run url_for
parsed = urlparse.urlparse(conf.get('ckan.site_url', 'http://0.0.0.0'))
request_config = routes.request_config()
request_config.host = parsed.netloc + parsed.path
request_config.protocol = parsed.scheme


def paster_click_group(summary):
'''Return a paster command click.Group for paster subcommands
:param command: the paster command linked to this function from
setup.py, used in help text (e.g. "datastore")
:param summary: summary text used in paster's help/command listings
(e.g. "Perform commands to set up the datastore")
'''
class PasterClickGroup(click.Group):
'''A click.Group that may be called like a paster command'''
def __call__(self, ignored_command):
sys.argv.remove(ignored_command)
return super(PasterClickGroup, self).__call__(
prog_name=u'paster ' + ignored_command,
help_option_names=[u'-h', u'--help'],
obj={})

@click.group(cls=PasterClickGroup)
@click.option(
'--plugin',
metavar='ckan',
help='paster plugin (when run outside ckan directory)')
@click_config_option
@click.pass_context
def cli(ctx, plugin, config):
ctx.obj['config'] = config


cli.summary = summary
cli.group_name = u'ckan'
return cli


# common definition for paster ... --config
click_config_option = click.option(
'-c',
'--config',
default=None,
metavar='CONFIG',
help=u'Config file to use (default: development.ini)')


class CkanCommand(paste.script.command.Command):
'''Base class for classes that implement CKAN paster commands to inherit.'''
parser = paste.script.command.Command.standard_parser(verbose=True)
parser.add_option('-c', '--config', dest='config',
default='development.ini', help='Config file to use.')
help='Config file to use.')
parser.add_option('-f', '--file',
action='store',
dest='file_path',
help="File to dump results to (if needed)")
default_verbosity = 1
group_name = 'ckan'

def _get_config(self):
from paste.deploy import appconfig

if self.options.config:
self.filename = os.path.abspath(self.options.config)
config_source = '-c parameter'
elif os.environ.get('CKAN_INI'):
self.filename = os.environ.get('CKAN_INI')
config_source = '$CKAN_INI'
else:
self.filename = os.path.join(os.getcwd(), 'development.ini')
config_source = 'default value'

if not os.path.exists(self.filename):
msg = 'Config file not found: %s' % self.filename
msg += '\n(Given by: %s)' % config_source
raise self.BadCommand(msg)

fileConfig(self.filename)
return appconfig('config:' + self.filename)

def _load_config(self, load_site_user=True):
conf = self._get_config()
assert 'ckan' not in dir() # otherwise loggers would be disabled
# We have now loaded the config. Now we can import ckan for the
# first time.
from ckan.config.environment import load_environment
load_environment(conf.global_conf, conf.local_conf)

self.registry = Registry()
self.registry.prepare()
import pylons
self.translator_obj = MockTranslator()
self.registry.register(pylons.translator, self.translator_obj)

if model.user_table.exists() and load_site_user:
# If the DB has already been initialized, create and register
# a pylons context object, and add the site user to it, so the
# auth works as in a normal web request
c = pylons.util.AttribSafeContextObj()

self.registry.register(pylons.c, c)

self.site_user = logic.get_action('get_site_user')({'ignore_auth': True}, {})

pylons.c.user = self.site_user['name']
pylons.c.userobj = model.User.get(self.site_user['name'])

## give routes enough information to run url_for
parsed = urlparse.urlparse(conf.get('ckan.site_url', 'http://0.0.0.0'))
request_config = routes.request_config()
request_config.host = parsed.netloc + parsed.path
request_config.protocol = parsed.scheme
load_config(self.options.config, load_site_user)

def _setup_app(self):
cmd = paste.script.appinstall.SetupCommand('setup-app')
Expand Down Expand Up @@ -643,12 +746,11 @@ class Sysadmin(CkanCommand):

summary = __doc__.split('\n')[0]
usage = __doc__
max_args = 2
max_args = None
min_args = 0

def command(self):
self._load_config()
import ckan.model as model

cmd = self.args[0] if self.args else None
if cmd is None or cmd == 'list':
Expand Down Expand Up @@ -684,10 +786,8 @@ def add(self):
print 'User "%s" not found' % username
makeuser = raw_input('Create new user: %s? [y/n]' % username)
if makeuser == 'y':
password = UserCmd.password_prompt()
print('Creating %s user' % username)
user = model.User(name=unicode(username),
password=password)
user_add(self.args[1:])
user = model.User.by_name(unicode(username))
else:
print 'Exiting ...'
return
Expand Down Expand Up @@ -737,7 +837,6 @@ class UserCmd(CkanCommand):

def command(self):
self._load_config()
import ckan.model as model

if not self.args:
self.list()
Expand Down Expand Up @@ -817,42 +916,7 @@ def password_prompt(cls):
return password1

def add(self):
import ckan.model as model

if len(self.args) < 2:
error('Need name of the user.')
username = self.args[1]

# parse args into data_dict
data_dict = {'name': username}
for arg in self.args[2:]:
try:
field, value = arg.split('=', 1)
data_dict[field] = value
except ValueError:
raise ValueError('Could not parse arg: %r (expected "<option>=<value>)"' % arg)

if 'password' not in data_dict:
data_dict['password'] = self.password_prompt()

if 'fullname' in data_dict:
data_dict['fullname'] = data_dict['fullname'].decode(sys.getfilesystemencoding())

print('Creating user: %r' % username)

try:
import ckan.logic as logic
site_user = logic.get_action('get_site_user')({'model': model, 'ignore_auth': True}, {})
context = {
'model': model,
'session': model.Session,
'ignore_auth': True,
'user': site_user['name'],
}
user_dict = logic.get_action('user_create')(context, data_dict)
pprint(user_dict)
except logic.ValidationError, e:
error(traceback.format_exc())
user_add(self.args[1:])

def remove(self):
import ckan.model as model
Expand Down

0 comments on commit 1bd499e

Please sign in to comment.