artifacts: added DB store models.

rhodecode/lib/dbmigrate/versions/095_version_4_16_0.py

@@ -0,0 +1,30 b''
+import logging
+
+from sqlalchemy import *
+
+from rhodecode.model import meta
+from rhodecode.lib.dbmigrate.versions import _reset_base, notify
+
+log = logging.getLogger(__name__)
+
+
+def upgrade(migrate_engine):
+    """
+    Upgrade operations go here.
+    Don't create your own engine; bind migrate_engine to your metadata
+    """
+    _reset_base(migrate_engine)
+    from rhodecode.lib.dbmigrate.schema import db_4_16_0_2 as db
+
+    db.FileStore.__table__.create()
+
+    fixups(db, meta.Session)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+
+def fixups(models, _SESSION):
+    pass

rhodecode/__init__.py

@@ -45,7 +45,7 b' PYRAMID_SETTINGS = {}'
 EXTENSIONS = {}
 
 __version__ = ('.'.join((str(each) for each in VERSION[:3])))
-__dbversion__ = 94  # defines current db version for migrations
+__dbversion__ = 95  # defines current db version for migrations
 __platform__ = platform.system()
 __license__ = 'AGPLv3, and Commercial License'
 __author__ = 'RhodeCode GmbH'

rhodecode/api/views/server_api.py

@@ -417,65 +417,3 b' def store_exception(request, apiuser, ex'
     exc_url = request.route_url(
         'admin_settings_exception_tracker_show', exception_id=exc_id)
     return {'exc_id': exc_id, 'exc_url': exc_url}
-
-
-@jsonrpc_method()
-def upload_file(request, apiuser, filename, content):
-    """
-    Upload API for the file_store
-
-    Example usage from CLI::
-        rhodecode-api --instance-name=enterprise-1 upload_file "{\"content\": \"$(cat image.jpg | base64)\", \"filename\":\"image.jpg\"}"
-
-
-    This command can only be run using an |authtoken| with admin rights to
-    the specified repository.
-
-    This command takes the following options:
-
-    :param apiuser: This is filled automatically from the |authtoken|.
-    :type apiuser: AuthUser
-    :param filename: name of the file uploaded
-    :type filename: str
-    :param content: base64 encoded content of the uploaded file
-    :type prefix: str
-
-    Example output:
-
-    .. code-block:: bash
-
-      id : <id_given_in_input>
-      result: {
-        "access_path": "/_file_store/download/84d156f7-8323-4ad3-9fce-4a8e88e1deaf-0.jpg",
-        "access_path_fqn": "http://server.domain.com/_file_store/download/84d156f7-8323-4ad3-9fce-4a8e88e1deaf-0.jpg",
-        "store_fid": "84d156f7-8323-4ad3-9fce-4a8e88e1deaf-0.jpg"
-      }
-      error :  null
-    """
-    if not has_superadmin_permission(apiuser):
-        raise JSONRPCForbidden()
-
-    storage = utils.get_file_storage(request.registry.settings)
-
-    try:
-        file_obj = compat.NativeIO(base64.decodestring(content))
-    except Exception as exc:
-        raise JSONRPCError('File `{}` content decoding error: {}.'.format(filename, exc))
-
-    metadata = {
-        'filename': filename,
-        'size': '',  # filled by save_file
-        'user_uploaded': {'username': apiuser.username,
-                          'user_id': apiuser.user_id,
-                          'ip': apiuser.ip_addr}}
-    try:
-        store_fid, metadata = storage.save_file(file_obj, filename, metadata=metadata)
-    except FileNotAllowedException:
-        raise JSONRPCError('File `{}` is not allowed.'.format(filename))
-
-    except FileOverSizeException:
-        raise JSONRPCError('File `{}` is exceeding allowed limit.'.format(filename))
-
-    return {'store_fid': store_fid,
-            'access_path_fqn': request.route_url('download_file', fid=store_fid),
-            'access_path': request.route_path('download_file', fid=store_fid)}

rhodecode/model/db.py

@@ -4841,6 +4841,62 b' class UserBookmark(Base, BaseModel):'
         return u'<UserBookmark(%d @ %r)>' % (self.position, self.redirect_url)
 
 
+class FileStore(Base, BaseModel):
+    __tablename__ = 'file_store'
+    __table_args__ = (
+        base_table_args
+    )
+
+    file_store_id = Column('file_store_id', Integer(), primary_key=True)
+    file_uid = Column('file_uid', String(1024), nullable=False)
+    file_display_name = Column('file_display_name', UnicodeText().with_variant(UnicodeText(2048), 'mysql'), nullable=True)
+    file_description = Column('file_description', UnicodeText().with_variant(UnicodeText(10240), 'mysql'), nullable=True)
+    file_org_name = Column('file_org_name', UnicodeText().with_variant(UnicodeText(10240), 'mysql'), nullable=False)
+
+    # sha256 hash
+    file_hash = Column('file_hash', String(512), nullable=False)
+    file_size = Column('file_size', Integer(), nullable=False)
+
+    created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
+    accessed_on = Column('accessed_on', DateTime(timezone=False), nullable=True)
+    accessed_count = Column('accessed_count', Integer(), default=0)
+
+    enabled = Column('enabled', Boolean(), nullable=False, default=True)
+
+    # if repo/repo_group reference is set, check for permissions
+    check_acl = Column('check_acl', Boolean(), nullable=False, default=True)
+
+    user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
+    upload_user = relationship('User', lazy='joined', primaryjoin='User.user_id==FileStore.user_id')
+
+    # scope limited to user, which requester have access to
+    scope_user_id = Column(
+        'scope_user_id', Integer(), ForeignKey('users.user_id'),
+        nullable=True, unique=None, default=None)
+    user = relationship('User', lazy='joined', primaryjoin='User.user_id==FileStore.scope_user_id')
+
+    # scope limited to user group, which requester have access to
+    scope_user_group_id = Column(
+        'scope_user_group_id', Integer(), ForeignKey('users_groups.users_group_id'),
+        nullable=True, unique=None, default=None)
+    user_group = relationship('UserGroup', lazy='joined')
+
+    # scope limited to repo, which requester have access to
+    scope_repo_id = Column(
+        'scope_repo_id', Integer(), ForeignKey('repositories.repo_id'),
+        nullable=True, unique=None, default=None)
+    repo = relationship('Repository', lazy='joined')
+
+    # scope limited to repo group, which requester have access to
+    scope_repo_group_id = Column(
+        'scope_repo_group_id', Integer(), ForeignKey('groups.group_id'),
+        nullable=True, unique=None, default=None)
+    repo_group = relationship('RepoGroup', lazy='joined')
+
+    def __repr__(self):
+        return '<FileStore({})>'.format(self.file_store_id)
+
+
 class DbMigrateVersion(Base, BaseModel):
     __tablename__ = 'db_migrate_version'
     __table_args__ = (