Merge branch 'master' into git

util/backfill_aggregate_sizes.py

@@ -0,0 +1,49 @@
+import logging
+
+from data.database import ImageStorage, Image, db
+from app import app
+
+LOGGER = logging.getLogger(__name__)
+
+def backfill_aggregate_sizes():
+  """ Generates aggregate sizes for any image storage entries without them """
+  LOGGER.setLevel(logging.DEBUG)
+  LOGGER.debug('Aggregate sizes backfill: Began execution')
+  while True:
+    batch_storage_ids = list(ImageStorage
+                          .select(ImageStorage.id)
+                          .where(ImageStorage.aggregate_size >> None)
+                          .limit(10))
+
+    if len(batch_storage_ids) == 0:
+      # There are no storages left to backfill. We're done!
+      LOGGER.debug('Aggregate sizes backfill: Backfill completed')
+      return
+
+    LOGGER.debug('Aggregate sizes backfill: Found %s records to update', len(batch_storage_ids))
+    for image_storage_id in batch_storage_ids:
+      LOGGER.debug('Updating image storage: %s', image_storage_id.id)
+
+      with app.config['DB_TRANSACTION_FACTORY'](db):
+        try:
+          storage = ImageStorage.select().where(ImageStorage.id == image_storage_id.id).get()
+          image  = Image.select().where(Image.storage == storage).get()
+
+          image_ids = image.ancestors.split('/')[1:-1]
+          aggregate_size = storage.image_size
+          for image_id in image_ids:
+            current_image = Image.select().where(Image.id == image_id).join(ImageStorage)
+            aggregate_size += image.storage.image_size
+
+          storage.aggregate_size = aggregate_size
+          storage.save()
+        except ImageStorage.DoesNotExist:
+          pass
+        except Image.DoesNotExist:
+          pass
+
+
+if __name__ == "__main__":
+  logging.basicConfig(level=logging.DEBUG)
+  logging.getLogger('peewee').setLevel(logging.CRITICAL)
+  backfill_aggregate_sizes()

util/config/validator.py

@@ -232,12 +232,17 @@ def _validate_ldap(config):
     raise Exception('Missing Admin Password for LDAP configuration')
 
   ldap_uri = config.get('LDAP_URI', 'ldap://localhost')
+  if not ldap_uri.startswith('ldap://') and not ldap_uri.startswith('ldaps://'):
+    raise Exception('LDAP URI must start with ldap:// or ldaps://')
 
   try:
     with LDAPConnection(ldap_uri, admin_dn, admin_passwd):
       pass
   except ldap.LDAPError as ex:
     values = ex.args[0] if ex.args else {}
+    if not isinstance(values, dict):
+      raise Exception(str(ex.args))
+
     raise Exception(values.get('desc', 'Unknown error'))