##// END OF EJS Templates
auth-tokens: added scope into auth tokens (ApiKeys before refactoring)...
marcink -
r1475:9985d7e7 default
parent child Browse files
Show More

The requested changes are too big and content was truncated. Show full diff

@@ -0,0 +1,65 b''
1 import logging
2
3 from sqlalchemy import *
4 from sqlalchemy.engine import reflection
5
6 from alembic.migration import MigrationContext
7 from alembic.operations import Operations
8
9 from rhodecode.model import meta
10 from rhodecode.lib.dbmigrate.versions import _reset_base, notify
11
12 log = logging.getLogger(__name__)
13
14
15 def get_by_key(cls, key):
16 return cls.query().filter(cls.ui_key == key).scalar()
17
18
19 def upgrade(migrate_engine):
20 """
21 Upgrade operations go here.
22 Don't create your own engine; bind migrate_engine to your metadata
23 """
24 _reset_base(migrate_engine)
25 from rhodecode.lib.dbmigrate.schema import db_4_7_0_0
26
27 # make sure we re-create api-keys indexes
28
29 context = MigrationContext.configure(migrate_engine.connect())
30 op = Operations(context)
31
32 existing_indexes = _get_indexes_list(
33 migrate_engine, db_4_7_0_0.UserApiKeys.__tablename__)
34
35 names = [idx['name'] for idx in existing_indexes]
36
37 with op.batch_alter_table(db_4_7_0_0.UserApiKeys.__tablename__) as batch_op:
38 if 'uak_api_key_idx' not in names:
39 batch_op.create_index(
40 'uak_api_key_idx', ['api_key'])
41 if 'uak_api_key_expires_idx' not in names:
42 batch_op.create_index(
43 'uak_api_key_expires_idx', ['api_key', 'expires'])
44
45 # issue fixups
46 fixups(db_4_7_0_0, meta.Session)
47
48
49 def downgrade(migrate_engine):
50 meta = MetaData()
51 meta.bind = migrate_engine
52
53
54 def fixups(models, _SESSION):
55 pass
56
57
58 def _get_unique_constraint_list(migrate_engine, table_name):
59 inspector = reflection.Inspector.from_engine(migrate_engine)
60 return inspector.get_unique_constraints(table_name)
61
62
63 def _get_indexes_list(migrate_engine, table_name):
64 inspector = reflection.Inspector.from_engine(migrate_engine)
65 return inspector.get_indexes(table_name)
@@ -0,0 +1,44 b''
1 import logging
2
3 from sqlalchemy import *
4 from rhodecode.model import meta
5 from rhodecode.lib.dbmigrate.versions import _reset_base, notify
6
7 log = logging.getLogger(__name__)
8
9
10 def get_by_key(cls, key):
11 return cls.query().filter(cls.ui_key == key).scalar()
12
13
14 def upgrade(migrate_engine):
15 """
16 Upgrade operations go here.
17 Don't create your own engine; bind migrate_engine to your metadata
18 """
19 _reset_base(migrate_engine)
20 from rhodecode.lib.dbmigrate.schema import db_4_7_0_0
21
22 auth_token_table = db_4_7_0_0.UserApiKeys.__table__
23
24 repo_id = Column(
25 'repo_id', Integer(), ForeignKey('repositories.repo_id'),
26 nullable=True, unique=None, default=None)
27 repo_id.create(table=auth_token_table)
28
29 repo_group_id = Column(
30 'repo_group_id', Integer(), ForeignKey('groups.group_id'),
31 nullable=True, unique=None, default=None)
32 repo_group_id.create(table=auth_token_table)
33
34 # issue fixups
35 fixups(db_4_7_0_0, meta.Session)
36
37
38 def downgrade(migrate_engine):
39 meta = MetaData()
40 meta.bind = migrate_engine
41
42
43 def fixups(models, _SESSION):
44 pass
@@ -1,63 +1,63 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 # Copyright (C) 2010-2017 RhodeCode GmbH
3 # Copyright (C) 2010-2017 RhodeCode GmbH
4 #
4 #
5 # This program is free software: you can redistribute it and/or modify
5 # This program is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU Affero General Public License, version 3
6 # it under the terms of the GNU Affero General Public License, version 3
7 # (only), as published by the Free Software Foundation.
7 # (only), as published by the Free Software Foundation.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU Affero General Public License
14 # You should have received a copy of the GNU Affero General Public License
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 #
16 #
17 # This program is dual-licensed. If you wish to learn more about the
17 # This program is dual-licensed. If you wish to learn more about the
18 # RhodeCode Enterprise Edition, including its added features, Support services,
18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20
20
21 """
21 """
22
22
23 RhodeCode, a web based repository management software
23 RhodeCode, a web based repository management software
24 versioning implementation: http://www.python.org/dev/peps/pep-0386/
24 versioning implementation: http://www.python.org/dev/peps/pep-0386/
25 """
25 """
26
26
27 import os
27 import os
28 import sys
28 import sys
29 import platform
29 import platform
30
30
31 VERSION = tuple(open(os.path.join(
31 VERSION = tuple(open(os.path.join(
32 os.path.dirname(__file__), 'VERSION')).read().split('.'))
32 os.path.dirname(__file__), 'VERSION')).read().split('.'))
33
33
34 BACKENDS = {
34 BACKENDS = {
35 'hg': 'Mercurial repository',
35 'hg': 'Mercurial repository',
36 'git': 'Git repository',
36 'git': 'Git repository',
37 'svn': 'Subversion repository',
37 'svn': 'Subversion repository',
38 }
38 }
39
39
40 CELERY_ENABLED = False
40 CELERY_ENABLED = False
41 CELERY_EAGER = False
41 CELERY_EAGER = False
42
42
43 # link to config for pylons
43 # link to config for pylons
44 CONFIG = {}
44 CONFIG = {}
45
45
46 # Populated with the settings dictionary from application init in
46 # Populated with the settings dictionary from application init in
47 # rhodecode.conf.environment.load_pyramid_environment
47 # rhodecode.conf.environment.load_pyramid_environment
48 PYRAMID_SETTINGS = {}
48 PYRAMID_SETTINGS = {}
49
49
50 # Linked module for extensions
50 # Linked module for extensions
51 EXTENSIONS = {}
51 EXTENSIONS = {}
52
52
53 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
53 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
54 __dbversion__ = 65 # defines current db version for migrations
54 __dbversion__ = 67 # defines current db version for migrations
55 __platform__ = platform.system()
55 __platform__ = platform.system()
56 __license__ = 'AGPLv3, and Commercial License'
56 __license__ = 'AGPLv3, and Commercial License'
57 __author__ = 'RhodeCode GmbH'
57 __author__ = 'RhodeCode GmbH'
58 __url__ = 'https://code.rhodecode.com'
58 __url__ = 'https://code.rhodecode.com'
59
59
60 is_windows = __platform__ in ['Windows']
60 is_windows = __platform__ in ['Windows']
61 is_unix = not is_windows
61 is_unix = not is_windows
62 is_test = False
62 is_test = False
63 disable_error_handler = False
63 disable_error_handler = False
1 NO CONTENT: modified file
NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now