django-restit 4.2.176__tar.gz → 4.2.179__tar.gz

{django_restit-4.2.176 → django_restit-4.2.179}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-restit
-Version: 4.2.176
+Version: 4.2.179
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.176 → django_restit-4.2.179}/account/models/group.py

@@ -52,6 +52,7 @@ class Group(models.Model, RestModel, MetaDataModel):
         LIST_PARENT_KINDS = ["org", "iso"]
         POST_SAVE_FIELDS = ["child_of"]
         GROUP_FIELD = "self"
+        CAN_BATCH = True
         VIEW_PERMS = [
             "view_all_groups",
             "manage_groups",

{django_restit-4.2.176 → django_restit-4.2.179}/account/models/member.py

@@ -72,6 +72,7 @@ class Member(User, RestModel, MetaDataModel):
         SEARCH_FIELDS = ["username", "email", "first_name", "last_name", "display_name", "phone_number"]
         VIEW_PERMS = ["view_members", "manage_members", "manage_users", "owner"]
         SAVE_PERMS = ["invite_members", "manage_members", "manage_users", "owner"]
+        CAN_BATCH = True
         LIST_DEFAULT_FILTERS = {
             "is_active": True
         }
@@ -988,7 +989,12 @@ class Member(User, RestModel, MetaDataModel):
             request.member.log("permission_denied", "attempting to set password for user: {}".format(self.username), method="password_change", level=3)
             raise PermissionDeniedException("Permission Denied: attempting to change password")
         if request.member.id != self.id:
-            self.log("modified_by", "password changed by: {}".format(request.member.username), method="password_change", level=31)
+            error = f"{self.username} password changed by: {request.member.username}"
+            self.reportIncident("account", error, details=error, error_code=497)
+            self.log("modified_by", error, method="password_change", level=31)
+
+            error = f"{self.username} password changed by: {request.member.username}"
+            request.member.reportIncident("account", error, details=error, error_code=497)
             request.member.log("member_edit", "{} password changed".format(self.username), method="password_change", level=31)
             self.setPassword(value, skip_history=True)
         else:

{django_restit-4.2.176 → django_restit-4.2.179}/account/rpc/auth.py

@@ -84,9 +84,10 @@ def on_complete_jwt(request, member, method="basic"):
     request.device_id = device_id
     request.buid = request.DATA.get("__buid__", None)
     request.auth_session = am.AuthSession.NewSession(request, method)
+    if not bool(device_id) and bool(request.buid):
+        device_id = request.buid
     if bool(device_id):
         am.MemberDevice.register(request, member, device_id)
-
     request.jwt_token = token.access_token  # this tells the middleware to store in cookie
     return rv.restGet(
         request,

{django_restit-4.2.176 → django_restit-4.2.179}/inbox/utils/parsing.py

@@ -131,7 +131,7 @@ def toFileObject(attachment):
     return obj
 
 
-def parseAddresses(input_string, force_name=False):
+def parseAddresses(input_string, force_name=False, emails_only=False):
     if input_string is None:
         return []
     # Define a regex pattern to capture email addresses
@@ -153,6 +153,8 @@ def parseAddresses(input_string, force_name=False):
         else:
             name = None
         parsed_emails.append(objict(name=name, email=addr, full_email=full_email))
+    if emails_only:
+        return [email.email for email in parsed_emails]
     return parsed_emails
 
 
@@ -164,4 +166,3 @@ def toString(value):
     elif isinstance(value, (int, float)):
         value = str(value)
     return value
-

{django_restit-4.2.176 → django_restit-4.2.179}/inbox/utils/render.py

@@ -12,10 +12,17 @@ import re
 
 
 def createMessage(sender, recipients, subject, text, html, attachments=None, replyto=None):
-    message = objict(sender=sender, recipients=recipients)
 
-    if not isinstance(message.recipients, (tuple, list)):
-        message.recipients = [message.recipients]
+    if isinstance(recipients, str):
+        if "," in recipients:
+            recipients = [t.strip() for t in recipients.split(',')]
+        elif ";" in recipients:
+            recipients = [t.strip() for t in recipients.split(';')]
+
+    if not isinstance(recipients, (tuple, list)):
+        recipients = [recipients]
+
+    message = objict(sender=sender, recipients=recipients)
 
     if attachments is None:
         attachments = []

{django_restit-4.2.176 → django_restit-4.2.179}/medialib/models.py

@@ -16,16 +16,14 @@ import urllib.request, urllib.error, urllib.parse
 from urllib.parse import urlparse
 from datetime import datetime, date
 import os
-import hashlib
 import time
-import mimetypes
 import tempfile
 import re
 
 from medialib import utils
 from rest import settings
 from rest.models import RestModel, MetaDataBase, MetaDataModel
-from rest.decorators import rest_async
+from rest import filetypes
 
 from taskqueue.models import Task
 
@@ -547,7 +545,7 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
                 if kind in ["png", "jpg", "jpeg", "jfif", "bmp", "gif", "tif"]:
                     self.kind = "I"
                     return
-        (mt, _) = mimetypes.guess_type(filename)
+        mt = filetypes.guess_type(filename)
         if mt == None:
             self.kind = '*'
         elif mt[:6] == 'image/':
@@ -833,7 +831,7 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
             return image
         return {
             "kind": image.kind,
-            "content_type": mimetypes.guess_type(image.url)[0],
+            "content_type": filetypes.guess_type(image.url),
             "bytes":image.bytes,
             "url":image.view_url(request=request, expires=None, is_secure=True),
             "width":image.width,
@@ -860,7 +858,7 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
             return None
         return {
             "kind": orig.kind,
-            "content_type": mimetypes.guess_type(self.name)[0],
+            "content_type": filetypes.guess_type(self.name),
             "bytes":orig.bytes,
             "url":orig.view_url(request=request, expires=None, is_secure=True),
             "width":orig.width,
@@ -1466,4 +1464,3 @@ class MediaItemParameterSetting(models.Model):
 
     def __str__(self):
         return "%s - %s" % (str(self.item), str(self.parameter))
-

{django_restit-4.2.176 → django_restit-4.2.179}/metrics/client.py

@@ -329,7 +329,7 @@ class R(object):
             for s in slug:
                 self.metric(s, num, category, expire, date)
             return
-        
+
         # Add the slug to the set of metric slugs
         try:
             self.r.sadd(self._metric_slugs_key, slug)
@@ -382,12 +382,12 @@ class R(object):
         keys = utils.build_keys(slug, min_granularity=min_granularity, max_granularity=max_granularity)
 
         for granularity, key in zip(granularities, keys):
-            rh.debug("-- get_metric --", granularity, key)
+            # rh.debug("-- get_metric --", granularity, key)
             try:
                 results[granularity] = int(self.r.get(key))
             except Exception:
                 results[granularity] = 0
-                rh.log_exception("get_metric", granularity, key)
+                # rh.log_exception("get_metric", granularity, key)
         if min_granularity and min_granularity == max_granularity:
             return results[min_granularity]
         return results
@@ -661,4 +661,3 @@ class R(object):
         key = self._gauge_key(slug)
         self.r.delete(key)  # Remove the Gauge
         self.r.srem(self._gauge_slugs_key, slug)  # Remove from the set of keys
-

{django_restit-4.2.176 → django_restit-4.2.179}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.176"
+version = "4.2.179"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.176 → django_restit-4.2.179}/rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.176"
+__version__ = "4.2.179"

django_restit-4.2.179/rest/filetypes.py

@@ -0,0 +1,128 @@
+EXTENSION_TO_MIME = {
+    # Documents
+    '.pdf': 'application/pdf',
+    '.doc': 'application/msword',
+    '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    '.xls': 'application/vnd.ms-excel',
+    '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    '.ppt': 'application/vnd.ms-powerpoint',
+    '.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    '.csv': 'text/csv',
+    '.tsv': 'text/tab-separated-values',
+    '.txt': 'text/plain',
+    '.rtf': 'application/rtf',
+    '.odt': 'application/vnd.oasis.opendocument.text',
+    '.ods': 'application/vnd.oasis.opendocument.spreadsheet',
+    '.md': 'text/markdown',
+    '.epub': 'application/epub+zip',
+    '.ics': 'text/calendar',
+
+    # Images
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.png': 'image/png',
+    '.gif': 'image/gif',
+    '.bmp': 'image/bmp',
+    '.webp': 'image/webp',
+    '.tiff': 'image/tiff',
+    '.svg': 'image/svg+xml',
+    '.heic': 'image/heic',
+    '.ico': 'image/vnd.microsoft.icon',
+
+    # Audio
+    '.mp3': 'audio/mpeg',
+    '.wav': 'audio/wav',
+    '.ogg': 'audio/ogg',
+    '.m4a': 'audio/mp4',
+    '.flac': 'audio/flac',
+
+    # Video
+    '.mp4': 'video/mp4',
+    '.mov': 'video/quicktime',
+    '.avi': 'video/x-msvideo',
+    '.wmv': 'video/x-ms-wmv',
+    '.webm': 'video/webm',
+    '.mkv': 'video/x-matroska',
+
+    # Archives
+    '.zip': 'application/zip',
+    '.tar': 'application/x-tar',
+    '.gz': 'application/gzip',
+    '.rar': 'application/vnd.rar',
+    '.7z': 'application/x-7z-compressed',
+    '.tar.gz': 'application/gzip',  # Special case
+    '.tgz': 'application/gzip',
+    '.bz2': 'application/x-bzip2',
+    '.tar.bz2': 'application/x-bzip2',
+
+    # Code / Data
+    '.json': 'application/json',
+    '.xml': 'application/xml',
+    '.html': 'text/html',
+    '.htm': 'text/html',
+    '.css': 'text/css',
+    '.js': 'application/javascript',
+    '.py': 'text/x-python',
+    '.java': 'text/x-java-source',
+    '.c': 'text/x-c',
+    '.cpp': 'text/x-c++',
+    '.ts': 'application/typescript',
+    '.yml': 'application/x-yaml',
+    '.yaml': 'application/x-yaml',
+    '.sql': 'application/sql',
+
+    # Fonts
+    '.woff': 'font/woff',
+    '.woff2': 'font/woff2',
+    '.ttf': 'font/ttf',
+    '.otf': 'font/otf',
+
+    # Misc
+    '.apk': 'application/vnd.android.package-archive',
+    '.exe': 'application/vnd.microsoft.portable-executable',
+    '.dmg': 'application/x-apple-diskimage',
+    '.bat': 'application/x-bat',
+    '.sh': 'application/x-sh',
+    '.pdfa': 'application/pdf',
+    '.webmanifest': 'application/manifest+json',
+}
+
+def parse_extension(filename):
+    """
+    Extract the extension from a filename, handling both single and double extensions,
+    and return the extension along with the filename without the extension.
+
+    Parameters:
+    filename (str): The name of the file for which to extract the extension.
+
+    Returns:
+    tuple: A tuple containing the extracted extension (or an empty string if no valid
+           extension is found) and the filename without the extension.
+    """
+    filename = filename.lower()
+    parts = filename.rsplit('.', 2)  # Max 2 splits: base.name.ext1.ext2
+    if len(parts) == 3:
+        double_ext = f".{parts[-2]}.{parts[-1]}"
+        if double_ext in EXTENSION_TO_MIME:
+            return double_ext, '.'.join(parts[:-1])
+    ext = f".{parts[-1]}" if '.' in filename else ''
+    base_filename = parts[0] if len(parts) == 1 else '.'.join(parts[:-1])
+    return ext.lower(), base_filename
+
+def guess_type(filename):
+    """
+    Guess the MIME type of a file based on its extension.
+
+    This function attempts to determine the MIME type of a file by examining
+    its extension. It can handle both single and double extensions, such as
+    ".tar.gz" or ".tar.bz2".
+
+    Parameters:
+    filename (str): The name of the file whose MIME type needs to be guessed.
+
+    Returns:
+    str: The guessed MIME type if found in EXTENSION_TO_MIME mapping, or
+         'application/octet-stream' as a default fallback.
+    """
+    ext, _ = parse_extension(filename)
+    return EXTENSION_TO_MIME.get(ext, 'application/octet-stream')

{django_restit-4.2.176 → django_restit-4.2.179}/rest/mail.py

@@ -3,7 +3,6 @@ import os
 import threading
 from io import StringIO
 import csv
-import mimetypes
 import boto3
 
 from email.mime.multipart import MIMEMultipart
@@ -25,6 +24,7 @@ from django.template import TemplateDoesNotExist
 
 import metrics
 from rest import settings
+from rest import filetypes
 from rest.uberdict import UberDict
 from rest.middleware import get_request
 from rest.log import getLogger
@@ -163,7 +163,8 @@ def sendMail(msg, sender, recipients, fail_silently=True):
 
 def makeAttachment(filename, data):
     atment = UberDict(name=filename, data=data)
-    atment.mimetype, junk = mimetypes.MimeTypes().guess_type(filename)
+    # atment.mimetype, junk = mimetypes.MimeTypes().guess_type(filename)
+    atment.mimetype = filetypes.guess_type(filename)
     return atment
 
 

{django_restit-4.2.176 → django_restit-4.2.179}/rest/models/base.py

@@ -1226,8 +1226,8 @@ class RestModel(object):
     @classmethod
     def on_rest_batch(cls, request, action):
         # this method is called when rest_batch='somme action'
-        if not ALLOW_BATCHING or not getattr(cls.RestMeta, "CAN_BATCH", True):
-            return GRAPH_HELPERS.restStatus(request, False, error="model does not allow batch actions")
+        if not ALLOW_BATCHING or not getattr(cls.RestMeta, "CAN_BATCH", False):
+            raise re.PermissionDeniedException(f"{cls.__name__} model does not allow batch actions", 439)
         cls._boundRest()
         # if not request.member.hasPerm("can_batch_update"):
         #     raise re.PermissionDeniedException(f"batch updated not allowed by user")
@@ -1246,7 +1246,7 @@ class RestModel(object):
             if not can_delete:
                 raise re.PermissionDeniedException(f"deletion not allowed for {cls.get_class_name()}", 438)
             count = qset.delete()[0]
-            return GRAPH_HELPERS.restStatus(request, True, error="delete {} items".format(count))
+            return GRAPH_HELPERS.restStatus(request, True, error="deleted {} items".format(count))
         elif action == "update":
             update_fields = request.DATA.get(["batch_data", "batch_update"])
             if not isinstance(update_fields, dict):