django-restit 4.0.2__py3-none-any.whl → 4.0.5__py3-none-any.whl

{django_restit-4.0.2.dist-info → django_restit-4.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.0.2
+Version: 4.0.5
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.0.2.dist-info → django_restit-4.0.5.dist-info}/RECORD

@@ -331,12 +331,17 @@ pushit/admin.py,sha256=69HdDZU_Iz8Fm72M8r8FUztsZvW37zdGwVmj8VTqr0c,451
 pushit/migrations/0001_initial.py,sha256=kYF1ksOlKf9ElrlagGhpNf5GbKEq6SORWGreMH9A7as,4555
 pushit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pushit/models.py,sha256=jrfreqBTThe0GvSbu16ACBMIGcZQX1534ECxVVtbVBk,5076
-pushit/rpc.py,sha256=qH4VQACLzqTY_iWEGMzFW8-2SQE9fny3NbJXPA64zF0,12431
+pushit/rpc/__init__.py,sha256=13ibfbWNdjoNxzCzF8QxasSzFgs8IZJPc05XhErOBCw,88
+pushit/rpc/githooks.py,sha256=p81qKjIcrFeQll1fKnm2pGRURWxKhT9TlH8PEHoc9po,1874
+pushit/rpc/legacy.py,sha256=9xsZH1S70htIb0bwKENfhTe-uHvyqSTiPiwYTlLWS3E,5028
+pushit/rpc/products.py,sha256=JFNN0VYsZQ9VJ5RZ3vD0m2hhsXEIB5Koz66inlMzx6Y,378
 pushit/static/js/models_pushit.js,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pushit/tq.py,sha256=i3uxKfXf3bjkb1XhGWILKxxL0YwsX0TIbYjkXGbbcWU,131
+pushit/utils.py,sha256=5NcWELJJjmiY2N7SiSh-qonJbLgVtFAu-EMkcFJ5St4,1966
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=TArumX0lGVebnvwT7qgRAdvQJcELeZTtZFrH4rn9etk,120
+rest/__init__.py,sha256=Khb1uCxKcOF2h84rJaf2ZhOpxZujpN9mAvCExA7fTlc,120
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
@@ -344,7 +349,7 @@ rest/crypto/aes.py,sha256=f7UgiTGCfgjCc7dL94vnxkPhq_5NzooI-kw0B8_nA58,3605
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
 rest/crypto/util.py,sha256=9xrXpdI7Q9L4B6N_UKkf0tyQCSNLIxPRoEVAyJraS3Y,3955
 rest/datem.py,sha256=Tv8wF2PX0Ktr1wLgGEj6o0OW45RSkD9XDLnLRk8bRjc,7784
-rest/decorators.py,sha256=HQV873NjgPTbTU0UCcTYp900mXvBqsKudqYH_fCLuCo,15213
+rest/decorators.py,sha256=OROP0VRNEk7FMk2WwLPnJ8olwyFX92bAsvQ7tg2tE3U,15597
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/extra/__init__.py,sha256=YzmNsch5H5FFLkUK9mIAKyoRK_rJCA9HGb0kubp4h30,54
 rest/extra/json_metadata.py,sha256=p_ffzmANmOFix_oC3voR6_NNTjcn7-T7aXcH-I4_Npg,1078
@@ -353,7 +358,7 @@ rest/forms.py,sha256=66Wm5cdy8tKib_mGicjq_yd-gNVMFWRECnrDksnNnwU,6316
 rest/helpers.py,sha256=ahTTAnsHPeBQTcxs7u-Yfjh5lP_hefDoBcIio12cYZg,23837
 rest/joke.py,sha256=0PpKaX2iN7jlS62kgjfmmqkFBYLPURz15aQ8R7OJkJ8,260
 rest/jwtoken.py,sha256=1ruZGPTXnodb85ywPd8ZmRiRYCskopA8EhcbX7Adixc,2298
-rest/log.py,sha256=EGrdGw2F0HIJUK7rKmQPLAEsQJq9WYum6RbYQambu4I,21139
+rest/log.py,sha256=hd1_4HBOS395sfXJIL6BTw9yekm1SLgBwYx_PdfIhKA,20930
 rest/mail.py,sha256=Y7EhkFAIcX4ieSJ7KLPeECmzYQEGAjWtkLlFvD87bhA,7754
 rest/mailman.py,sha256=v5O1G5s3HiAKmz-J1z0uT6_q3xsONPpxVl9saEyQQ2I,9174
 rest/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -369,7 +374,7 @@ rest/middleware/session_store.py,sha256=X_i06TnZLW1srV0vkjjLhZ7fl1G56PswXxRpVzdF
 rest/models.py,sha256=oVaAMiHCFJRERat2e3ejDs5TTKCiZNSe6muG6hgN6uI,76845
 rest/regexes.yaml,sha256=VoGb4E-P_K9f82Yzcpltgzekpt9usRtwu9PYlo46nUw,149463
 rest/requestex.py,sha256=eD1eCPhLl7fj0oUKpESCTIr8O7mjOyBUsRXVMQ1h3W8,14894
-rest/rpc.py,sha256=WguTRRnz2KUzilLN7-hgvn9OM9KSmfu10ZKkpFeFPtk,3480
+rest/rpc.py,sha256=KMih2Z4Z0Pqgwmcy_14nKqMCKJ9lGDJ6-vwMA2NSlyQ,3713
 rest/search.py,sha256=i7rnZZhlnuAT0isyVcMHEqGjbiz7EIArgjzzg7xwK-s,7645
 rest/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rest/serializers/collection.py,sha256=qpEQWl_mf_X72zFP8yNwJsDUTmc0h59KTfeFDs_Li1I,1644
@@ -393,7 +398,7 @@ rest/templates/rest_html.html,sha256=wGZV3j_tB9rzzJlsMxidUQ5ex_uRPyU_s8GCmHLXiqk
 rest/ua.py,sha256=iKoLdDFzwrmo_QfKxQoM88wPgvJabIIZPhxvIDfo5J0,185122
 rest/uberdict.py,sha256=ivDpzfchQqX8dM2_TtuyMW7NNO-j7zDmxkdKixQxvU4,17064
 rest/url_docs.py,sha256=O8O_CQso3fB-7o-huidIT1BRGv5R6lDW-yKHnsGyAPk,11881
-rest/urls.py,sha256=kD8tmeHr7ODe8NuC1d2R6ZGNCxcpQ8BbXdLeijwfmBc,1713
+rest/urls.py,sha256=U3eD9kI19wp-NkkXCiAjdQe560fslskQngStRcGDS0I,1787
 rest/views.py,sha256=IxG3RF5txtQg7ov4H_Iymozq3NjeJ-GQNMsmdmsmExM,1056
 sessionlog/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 sessionlog/README.md,sha256=vQEVJ_8u3Vv19VwPfscjCiHFu61ZSrEM-KIuBpUXhws,62
@@ -441,7 +446,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=lF-6nzv7SWjmFgmontpZKdSBhp8q4FhvFOcEYZGR8pc,1411
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.0.2.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.0.2.dist-info/METADATA,sha256=O3oqjfC3La_pKlrhrlrvx6yYE5c5OEGTPbCpV-TqLC4,7525
-django_restit-4.0.2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-django_restit-4.0.2.dist-info/RECORD,,
+django_restit-4.0.5.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.0.5.dist-info/METADATA,sha256=kGdo8wXQiGHWRi1D8ix5E6DV-LIjWSpMYpL91X7L8kg,7525
+django_restit-4.0.5.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+django_restit-4.0.5.dist-info/RECORD,,

pushit/rpc/__init__.py

@@ -0,0 +1,2 @@
+from .githooks import *  # noqa: F401, F403
+from .products import *  # noqa: F401, F403

pushit/rpc/githooks.py

@@ -0,0 +1,61 @@
+from rest import decorators as rd
+from rest import views as rv
+from rest import settings
+from rest import helpers as rh
+from taskqueue.models import Task
+from pushit import utils
+import time
+
+
+@rd.urlPOST('hooks/git_update')
+def rest_on_git_hook(request):
+    sec_key = request.DATA.get("token")
+    git_key = settings.get("GIT_KEY", "hookswhat")
+    hook_request = None
+
+    req_key = request.DATA.getHeader("HTTP_X_GITLAB_TOKEN")
+    if req_key is not None:
+        hook_request = utils.parseGitLab(request)
+    else:
+        req_key = request.DATA.getHeader("HTTP_X_HUB_SIGNATURE_256")
+        if req_key is not None:
+            hook_request = utils.parseGithub(request)    
+
+    if sec_key != git_key and req_key is None:
+        rh.error("GIT HOOK NO TOKEN", request.META)
+        return rv.restPermissionDenied(request)
+
+    git_projects = settings.get("GIT_PROJECTS", None)
+
+    if hook_request.name not in git_projects:
+        return rv.restStatus(request, False, error="no config for project")
+
+    proj_info = utils.getProjectForBranch(git_projects.get(hook_request.name), hook_request.branch)
+    if proj_info is None:
+        return rv.restStatus(request, False, error="no branch for project")
+
+    if hook_request.kind == "push":
+        on_git_push_request(proj_info, hook_request)
+
+    return rv.restStatus(request, True)
+
+
+def on_git_push_request(info, hook_request):
+    branch = info.get("branch")
+    cmd = info.get("updater")
+    use_tq = info.get("use_tq", False)
+
+    if use_tq:
+        data = dict(branch=branch, update_cmd=cmd)
+        Task.Publish("pushit", "run_update", data, channel="tq_updater")
+    else:
+        asyncUpdater(cmd, branch)
+
+
+@rd.rest_async
+def asyncUpdater(cmd, branch):
+    import random
+    # randomize the hit so we avoid collisions (gitlabs issues)
+    time.sleep(random.randint(2, 15))
+    utils.updateCode(cmd, branch)
+

pushit/rpc/legacy.py

@@ -0,0 +1,126 @@
+from pushit.models import Product, Release
+from rest import decorators as rd
+
+
+@rd.urlPOST (r'^product$')
+@rd.urlPOST (r'^product/(?P<product_id>\d+)$')
+@rd.urlPOST (r'^product/uuid/(?P<uuid>\w+)$')
+@rd.login_optional
+def updateProduct(request, product_id=None, uuid=None):
+    if not request.member:
+        return restPermissionDenied(request)
+    product = None
+    if not product_id and not uuid:
+        product = Product.createFromRequest(request, owner=request.member, group=request.group)
+    elif product_id:
+        product = Product.objects.filter(pk=product_id).last()
+    elif uuid:
+        product = Product.objects.filter(oid=uuid).last()
+
+    if not product:
+        return restStatus(request, False, error="unknown product")
+    if product.owner != request.member or (product.group and not request.member.isMemberOf(product.group)):
+        if not request.user.is_staff:
+            return restPermissionDenied(request)
+        product.saveFromRequest(request, owner=request.member)
+    return restGet(request, product, **Product.getGraph("default"))
+
+
+@rd.urlGET (r'^product/(?P<product_id>\d+)$')
+@rd.urlGET (r'^product/uuid/(?P<uuid>\w+)$')
+@rd.login_optional
+def getProduct(request, product_id=None, uuid=None):
+    product = None
+    if product_id:
+        product = Product.objects.filter(pk=product_id).last()
+    elif uuid:
+        product = Product.objects.filter(oid=uuid).last()
+    else:
+        return restNotFound(request)
+
+    if not product:
+        return restStatus(request, False, error="unknown product")
+    if not product.is_public and not request.member:
+        return restPermissionDenied(request, "not logged in")
+    return product.restGet(request)
+
+
+@rd.urlGET (r'^product$')
+@rd.login_optional
+def listProducts(request):
+    if not request.member:
+        return restPermissionDenied(request)
+    if not request.member.is_staff:
+        return restPermissionDenied(request)
+
+    kind = request.DATA.get("kind")
+    qset = Product.objects.filter(archived=False)
+    if kind:
+        qset = qset.filter(kind=kind)
+
+    return restList(request, qset, **Product.getGraph("default"))
+
+
+@rd.urlPOST (r'^release$')
+@rd.urlPOST (r'^release/(?P<release_id>\d+)$')
+@rd.login_optional
+def updateRelease(request, release_id=None):
+    if not request.member:
+        return restPermissionDenied(request)
+
+    if not release_id:
+        auto_version = request.DATA.get("auto_version", False)
+        prod_uuid = request.DATA.get(["product", "product_uuid"])
+        product = None
+        if prod_uuid:
+            product = Product.objects.filter(oid=prod_uuid).last()
+        else:
+            prod_id = request.DATA.get("product_id")
+            if prod_id:
+                product = Product.objects.filter(pk=prod_id).last()
+        if not product:
+            return restStatus(request, False, error="product required")
+        version_num = request.DATA.get("version_num", field_type=int)
+        last_release = Release.objects.filter(product=product).order_by("-version_num").first()
+
+        if not version_num:
+            if last_release and auto_version:
+                version_num = last_release.version_num + 1
+            elif auto_version:
+                version_num = 1
+            else:
+                return restStatus(request, False, error="no version info supplied, try auto_version=1")
+        elif last_release and version_num <= last_release.version_num:
+            return restStatus(request, False, error="version is not greater then last")
+
+        release = Release.createFromRequest(request, product=product, owner=request.member, group=request.group, version_num=version_num)
+    else:
+        release = Release.objects.filter(pk=release_id).last()
+        if not release:
+            return restStatus(request, False, error="unknown release")
+        if release.owner != request.member or (release.product.group and not request.member.isMemberOf(release.product.group)):
+            if not request.user.is_staff:
+                return restPermissionDenied(request)
+        release.saveFromRequest(request, owner=request.member)
+    if request.DATA.get("make_current"):
+        release.makeCurrent()
+    elif request.DATA.get("make_beta"):
+        release.makeCurrent()
+    return restGet(request, release, **Release.getGraph("default"))
+
+
+@rd.urlGET (r'^release/(?P<release_id>\d+)$')
+@rd.login_optional
+def getRelease(request, release_id):
+    release = Release.objects.filter(pk=release_id).last()
+    if not release:
+        return restStatus(request, False, error="unknown release")
+    if not release.product.is_public and not request.member:
+        return restPermissionDenied(request, "not logged in")
+    return restGet(request, release, **Release.getGraph("default"))
+
+
+def reportRestIssue(subject, message, perm="rest_errors", email_only=False):
+    # notifyWithPermission(perm, subject, message=None, template=None, context=None, email_only=False)
+    # notify email only
+    Member.notifyWithPermission(perm, subject, message, email_only=email_only)

pushit/rpc/products.py

@@ -0,0 +1,15 @@
+from rest import decorators as rd
+from rest import views as rv
+from pushit.models import Product, Release
+
+
+@rd.url('product')
+@rd.url('product/<int:pk>')
+def rest_on_product(request, pk=None):
+    return Product.on_rest_request(request, pk)
+
+
+@rd.url('release')
+@rd.url('release/<int:pk>')
+def rest_on_release(request, pk=None):
+    return Release.on_rest_request(request, pk)

pushit/tq.py

@@ -0,0 +1,6 @@
+from pushit import utils
+
+
+def run_update(task):
+    utils.run_update(task.data.update_cmd, task.data.branch)
+    task.completed()

pushit/utils.py

@@ -0,0 +1,58 @@
+from rest import settings
+from rest import log
+from objict import objict
+import os
+import subprocess
+
+logger = log.getLogger("pushit", filename="pushit.log")
+
+
+def updateCode(update_cmd, branch, update_user="ec2-user"):
+    if settings.PUSHIT_TEST_SUDO:
+        cmd = ["sudo", "-lU", update_user, update_cmd, branch]
+        process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = process.communicate()
+        if err.strip():
+            logger.warning("WARNING: cannot run {}, we don't have sudo rights".format(update_cmd))
+            logger.warning("WARNING: add {} to your sudo user".format(update_cmd))
+            return
+    # - lock it so we kill any updates in progress and start a new one
+    cmd = ["sudo", "-u", update_user, update_cmd, branch]
+    logger.info("updating...", cmd)
+    subprocess.Popen(cmd, close_fds=True)
+
+
+def parseGitLab(request):
+    info = objict(vendor="gitlab")
+    info.name = request.DATA.get("project.name")
+    info.kind = request.DATA.get("object_kind")
+    if "ref" in request.DATA:
+        info.branch = request.DATA.get("ref").split('/')[-1]
+    if info.kind == "merge_request":
+        info.state = request.DATA.get("object_attributes.state", None)
+        if info.state == "merged":
+            info.kind = "merged"
+    return info
+
+
+def parseGithub(request):
+    info = objict(vendor="github")
+    info.name = request.DATA.get("repository.name")
+    info.kind = request.DATA.getHeader("HTTP_X_GITHUB_EVENT")
+    if "ref" in request.DATA:
+        info.branch = request.DATA.get("ref").split('/')[-1]
+    logger.info("github request", info)
+    return info
+
+
+def getProjectForBranch(proj_info, branch):
+    if proj_info is None:
+        return None
+    if isinstance(proj_info, list):
+        for pi in proj_info:
+            if pi["branch"] == branch:
+                return pi
+        return None
+    if proj_info["branch"] == branch:
+        return proj_info
+    return None

rest/__init__.py

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

rest/decorators.py

@@ -18,12 +18,14 @@ from datetime import datetime
 from auditlog.models import PersistentLog
 
 import importlib
+import pkgutil
 import threading
 import traceback
 
 REST_METRICS = settings.get("REST_METRICS", False)
 REST_METRICS_BY_ENDPOINT = settings.get("REST_METRICS_BY_ENDPOINT", False)
 REST_METRICS_IGNORE = settings.get("REST_METRICS_IGNORE", [])
+REST_MODULE_NAME = settings.get("REST_MODULE_NAME", "rpc")
 
 
 # background task (no return)
@@ -130,6 +132,12 @@ def dispatcher(request, *args, **kwargs):
     return restStatus(request, False, error="endpoint not found", error_code=404)
 
 
+def _load_module(mod):
+    if pkgutil.find_loader(mod) is not None:
+        return importlib.import_module(mod)
+    return None
+
+
 def _url_method(pattern, method=None, *args, **kwargs):
     """
     Register a view handler for a specific HTTP method
@@ -150,13 +158,17 @@ def _url_method(pattern, method=None, *args, **kwargs):
                 # print module.__name__
                 root_name = module.__name__.split('.')[0]
                 # print "importing {0}.rpc".format(root_name)
-                rpc_root_module = importlib.import_module(root_name + ".rpc")
+                rmodule = _load_module(f"{root_name}.{REST_MODULE_NAME}")
+                if rmodule is not None:
+                    rpc_root_module = rmodule
             # print "{0}/{1}".format(rpc_root_module.__name__, pattern)
-            elif not module.__name__.endswith(".rpc") and module.__name__.count('.'):
+            elif not module.__name__.endswith(f".{REST_MODULE_NAME}") and module.__name__.count('.'):
                 # print module.__name__
                 root_name = module.__name__.split('.')[0]
                 # print "importing {0}.rpc".format(root_name)
-                rpc_root_module = importlib.import_module(root_name + ".rpc")
+                rmodule = _load_module(f"{root_name}.{REST_MODULE_NAME}")
+                if rmodule is not None:
+                    rpc_root_module = rmodule
             lmethod = method
             if lmethod is None:
                 lmethod = "ALL"

rest/log.py

@@ -12,7 +12,11 @@ import sys
 import threading
 import time
 import traceback
+from .settings_helper import settings
 
+LOG_FOLDER = settings.LOG_ROOT
+if LOG_FOLDER is None:
+    LOG_FOLDER = os.path.join(settings.BASE_DIR, "var", "logs")
 
 COLOR_LOGS = True
 MAX_LOG_SIZE = 10485760
@@ -21,19 +25,6 @@ MAX_LOG_SIZE = 10485760
 ROTATE_LEFT_OVER_BYTES = 50000
 LOG_COUNT = 3
 
-REST_FOLDER = os.path.realpath(__file__)
-# now work backwards until we find folder with "django"
-ROOT = None
-CUR_FOLDER = REST_FOLDER
-while ROOT is None:
-    if os.path.exists(os.path.join(CUR_FOLDER, "django")):
-        ROOT = CUR_FOLDER
-    else:
-        CUR_FOLDER = os.path.dirname(CUR_FOLDER)
-
-VAR_FOLDER = os.path.join(ROOT, "var", "logs")
-PATH = VAR_FOLDER
-
 
 class RestLogManager(object):
     def __init__(self):
@@ -121,8 +112,8 @@ def getLogger(
         LOG_MANAGER.loggers[name] = rest_logger
         if set_master:
             LOG_MANAGER.master = rest_logger
-        if not os.path.exists(VAR_FOLDER):
-            mkdir(VAR_FOLDER)
+        if not os.path.exists(LOG_FOLDER):
+            mkdir(LOG_FOLDER)
     except Exception as err:
         print((str(err)))
         print((str(traceback.format_exc())))
@@ -160,7 +151,7 @@ class RestLoggerStream(object):
                 if not os.path.exists(self.filename):
                     path, fname = os.path.split(filename)
                     if not len(path):
-                        self.filename = os.path.join(VAR_FOLDER, filename)
+                        self.filename = os.path.join(LOG_FOLDER, filename)
         self.max_bytes = max_bytes
         self.stream = None
         self.is_stdout = False

rest/rpc.py

@@ -31,6 +31,13 @@ def on_get_version(request):
     return views.restStatus(request, True, {"data": version.VERSION})
 
 
+@url(r'^versions$')
+def on_get_version(request):
+    from rest import __version__ as restit_version
+    versions = dict(project=version.VERSION, restit=restit_version)
+    return views.restStatus(request, True, {"data": versions})
+
+
 @url(r'^joke$')
 def on_get_joke(request):
     return views.restGet(request, {"joke": joke.getRandomJoke()})

rest/urls.py

@@ -24,7 +24,9 @@ urlpatterns = [
 def load_app(app, root_module=None):
     module = None
     try:
-        module = loadModule(app + '.rpc')
+        module = loadModule(f"{app}.rpc")
+        if module is None:
+            module = loadModule(f"{app}.rurl")
     except ImportError as err:
         print("**** failed to load {0}.rpc! ****".format(app))
         print("**** missing dependencies ****")

pushit/rpc.py

@@ -1,334 +0,0 @@
-from django.db import models
-
-
-from account.models import Member
-
-from rest.views import *
-from rest.decorators import *
-from rest import search
-from rest import helpers
-from rest import crypto
-from rest import log
-from rest import settings
-
-
-logger = log.getLogger("pushit", filename="pushit.log")
-
-from objict import objict
-
-from pushit.models import Product, Release
-
-import json
-
-import base64
-
-from datetime import datetime, timedelta
-import time
-
-@urlPOST (r'^product$')
-@urlPOST (r'^product/(?P<product_id>\d+)$')
-@urlPOST (r'^product/uuid/(?P<uuid>\w+)$')
-@login_optional
-def updateProduct(request, product_id=None, uuid=None):
-    if not request.member:
-        return restPermissionDenied(request)
-    product = None
-    if not product_id and not uuid:
-        product = Product.createFromRequest(request, owner=request.member, group=request.group)
-    elif product_id:
-        product = Product.objects.filter(pk=product_id).last()
-    elif uuid:
-        product = Product.objects.filter(oid=uuid).last()
-
-    if not product:
-        return restStatus(request, False, error="unknown product")
-    if product.owner != request.member or (product.group and not request.member.isMemberOf(product.group)):
-        if not request.user.is_staff:
-            return restPermissionDenied(request)
-        product.saveFromRequest(request, owner=request.member)
-    return restGet(request, product, **Product.getGraph("default"))
-
-@urlGET (r'^product/(?P<product_id>\d+)$')
-@urlGET (r'^product/uuid/(?P<uuid>\w+)$')
-@login_optional
-def getProduct(request, product_id=None, uuid=None):
-    product = None
-    if product_id:
-        product = Product.objects.filter(pk=product_id).last()
-    elif uuid:
-        product = Product.objects.filter(oid=uuid).last()
-    else:
-        return restNotFound(request)
-
-    if not product:
-        return restStatus(request, False, error="unknown product")
-    if not product.is_public and not request.member:
-        return restPermissionDenied(request, "not logged in")
-    return product.restGet(request)
-
-@urlGET (r'^product$')
-@login_optional
-def listProducts(request):
-    if not request.member:
-        return restPermissionDenied(request)
-    if not request.member.is_staff:
-        return restPermissionDenied(request)
-
-    kind = request.DATA.get("kind")
-    qset = Product.objects.filter(archived=False)
-    if kind:
-        qset = qset.filter(kind=kind)
-
-    return restList(request, qset, **Product.getGraph("default"))
-
-@urlPOST (r'^release$')
-@urlPOST (r'^release/(?P<release_id>\d+)$')
-@login_optional
-def updateRelease(request, release_id=None):
-    if not request.member:
-        return restPermissionDenied(request)
-
-    if not release_id:
-        auto_version = request.DATA.get("auto_version", False)
-        prod_uuid = request.DATA.get(["product", "product_uuid"])
-        product = None
-        if prod_uuid:
-            product = Product.objects.filter(oid=prod_uuid).last()
-        else:
-            prod_id = request.DATA.get("product_id")
-            if prod_id:
-                product = Product.objects.filter(pk=prod_id).last()
-        if not product:
-            return restStatus(request, False, error="product required")
-        version_num = request.DATA.get("version_num", field_type=int)
-        last_release = Release.objects.filter(product=product).order_by("-version_num").first()
-
-        if not version_num:
-            if last_release and auto_version:
-                version_num = last_release.version_num + 1
-            elif auto_version:
-                version_num = 1
-            else:
-                return restStatus(request, False, error="no version info supplied, try auto_version=1")
-        elif last_release and version_num <= last_release.version_num:
-            return restStatus(request, False, error="version is not greater then last")
-
-        release = Release.createFromRequest(request, product=product, owner=request.member, group=request.group, version_num=version_num)
-    else:
-        release = Release.objects.filter(pk=release_id).last()
-        if not release:
-            return restStatus(request, False, error="unknown release")
-        if release.owner != request.member or (release.product.group and not request.member.isMemberOf(release.product.group)):
-            if not request.user.is_staff:
-                return restPermissionDenied(request)
-        release.saveFromRequest(request, owner=request.member)
-    if request.DATA.get("make_current"):
-        release.makeCurrent()
-    elif request.DATA.get("make_beta"):
-        release.makeCurrent()
-    return restGet(request, release, **Release.getGraph("default"))
-
-@urlGET (r'^release/(?P<release_id>\d+)$')
-@login_optional
-def getRelease(request, release_id):
-    release = Release.objects.filter(pk=release_id).last()
-    if not release:
-        return restStatus(request, False, error="unknown release")
-    if not release.product.is_public and not request.member:
-        return restPermissionDenied(request, "not logged in")
-    return restGet(request, release, **Release.getGraph("default"))
-
-def reportRestIssue(subject, message, perm="rest_errors", email_only=False):
-    # notifyWithPermission(perm, subject, message=None, template=None, context=None, email_only=False)
-    # notify email only
-    Member.notifyWithPermission(perm, subject, message, email_only=email_only)
-
-from random import randint
-@rest_async
-def update_code(git_updater, updater_md5=None, branch=None):
-    # randomize the hit so we avoid collisions (gitlabs issues)
-    time.sleep(randint(1, 10))
-    import os
-    import subprocess
-    # check md5sum
-    if updater_md5:
-        cur_md5 = crypto.getFileMD5(git_updater)
-        if cur_md5.lower() != updater_md5.lower():
-            reportRestIssue("md5 check failed", "{}\ncould not be executed, md5 check failed".format(git_updater))
-            return
-
-    # TODO
-    # - check for errors and permissions
-    if settings.PUSHIT_TEST_SUDO:
-        cmd = ["sudo", "-lU", "ec2-user", git_updater, branch]
-        process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        out, err = process.communicate()
-        if err.strip():
-            logger.warning("WARNING: cannot run {}, we don't have sudo rights".format(git_updater))
-            logger.warning("WARNING: add {} to your sudo user".format(git_updater))
-            return
-    # - lock it so we kill any updates in progress and start a new one
-    cmd = ["sudo", "-u", "ec2-user", git_updater, branch]
-    logger.info("updating...", cmd)
-    subprocess.Popen(cmd, close_fds=True)
-
-@rest_async
-def new_release(product, tag, url, msg):
-    version_str = tag
-    if tag.startswith("v"):
-        version_str = tag[1:]
-
-    rev = tag.split('.')[-1]
-    if not rev.isdigit():
-        return False
-    token =  product.getProperty("git_token", "XXXXX")
-    release = Release(product=product, version_num=int(rev), version_str=version_str, notes=msg)
-    release.owner = product.owner
-    release_url = "{}/repository/{}/archive.zip?private_token={}".format(url, tag, token)
-    release.save()
-    logger.info(release_url)
-    release.set_media(release_url, True)
-    release.makeCurrent()
-
-def on_git_merge_request(info, request):
-    state = request.DATA.get("object_attributes.state")
-    target_branch = request.DATA.get("object_attributes.target_branch")
-
-    git_branch = info.get("branch")
-    git_updater = info.get("updater")
-    git_updater_md5 = info.get("updater_md5", None)
-
-    if target_branch == git_branch:
-        reportRestIssue(
-            "{} update({}) on: {}".format(info.get("project", "n/a"), settings.get("SERVER_NAME", "unknown"), git_branch),
-            "<pre>{}</pre>".format(helpers.dictToString(request.DATA.asDict(), True)),
-            "git_updates", email_only=True)
-        update_code(git_updater, git_updater_md5, git_branch)
-
-def on_git_push_request(info, hook_request):
-    git_branch = info.get("branch")
-    git_updater = info.get("updater")
-    git_updater_md5 = info.get("updater_md5", None)
-    update_code(git_updater, git_updater_md5, git_branch)
-
-def on_git_new_release(info, request):
-    project = request.DATA.get("project.name")
-    logger.info("NEW RELEASE FOR {}".format(project))
-    product = Product.objects.filter(name=project).last()
-    if not product:
-        logger.info("PRODUCT NOT FOUND")
-        return
-    tag = request.DATA.get("ref").split('/')[-1]
-    msg = request.DATA.get("message")
-    url = request.DATA.get("project.web_url")
-    if product and msg:
-        new_release(product, tag, url, msg)
-
-
-def parseGitLab(request):
-    info = objict(vendor="gitlab")
-    info.name = request.DATA.get("project.name")
-    info.kind = request.DATA.get("object_kind")
-    if "ref" in request.DATA:
-        info.branch = request.DATA.get("ref").split('/')[-1]
-    if info.kind == "merge_request":
-        info.state = request.DATA.get("object_attributes.state", None)
-        if info.state == "merged":
-            info.kind = "merged"
-    return info
-
-
-def parseGithub(request):
-    info = objict(vendor="github")
-    info.name = request.DATA.get("repository.name")
-    info.kind = request.DATA.getHeader("HTTP_X_GITHUB_EVENT")
-    if "ref" in request.DATA:
-        info.branch = request.DATA.get("ref").split('/')[-1]
-    logger.info("github request", info)
-    return info
-
-
-def getProjectForBranch(proj_info, branch):
-    if proj_info is None:
-        return None
-    if type(proj_info) is list:
-        for pi in proj_info:
-            if pi["branch"] == branch:
-                return pi
-        return None
-    if project_info["branch"] == branch:
-        return proj_info
-    return None
-
-
-@urlPOST (r'^hooks/git_update$')
-def on_git_hook(request):
-    sec_key = request.DATA.get("token")
-    git_key = settings.get("GIT_KEY", "hookswhat")
-    is_gitlab = True
-    hook_request = None
-    req_key = request.DATA.getHeader("HTTP_X_GITLAB_TOKEN")
-    if req_key is not None:
-        logger.info("GITLAB Detected")
-        hook_request = parseGitLab(request)
-    else:
-        req_key = request.DATA.getHeader("HTTP_X_HUB_SIGNATURE_256")
-        if req_key is not None:
-            is_gitlab = False
-            logger.info("GITHUB Detected")
-            hook_request = parseGithub(request)    
-
-    if sec_key != git_key:
-        if req_key is None:
-            logger.warning("NO TOKEN")
-            logger.warning(request.META)
-            return restPermissionDenied(request)
-
-    git_projects = settings.get("GIT_PROJECTS", None)
-
-    if hook_request.name not in git_projects:
-        return restStatus(request, False, error="no config for project")
-
-    proj_info = getProjectForBranch(git_projects.get(hook_request.name), hook_request.branch)
-    if proj_info is None:
-        logger.info("no branch for project", hook_request)
-        return restStatus(request, False, error="no branch for project")
-
-    if hook_request.kind == "push":
-        on_git_push_request(proj_info, hook_request)
-
-    # kind = request.DATA.get("object_kind")
-    # project = request.DATA.get("project.name")
-
-    # git_projects = settings.get("GIT_PROJECTS", None)
-    # if git_projects and project in git_projects:
-    #     proj_info = git_projects.get(project)
-    #     # now lets handle different kinds
-    #     if kind == "merge_request":
-    #         # now check the state
-    #         state = request.DATA.get("object_attributes.state", None)
-    #         if state != "merged":
-    #             return restStatus(request, True)
-    #         if type(proj_info) is list:
-    #             for info in proj_info:
-    #                 info["project"] = project
-    #                 on_git_merge_request(info, request)
-    #         else:
-    #             on_git_merge_request(proj_info, request)
-    #     elif kind == "push":
-    #         if type(proj_info) is list:
-    #             for info in proj_info:
-    #                 info["project"] = project
-    #                 on_git_push_request(info, request)
-    #         else:
-    #             proj_info["project"] = project
-    #             on_git_push_request(proj_info, request)
-    #     elif kind == "tag_push":
-    #         on_git_new_release(proj_info, request)
-    # elif kind == "tag_push":
-    #     proj_info = git_projects.get(project)
-    #     on_git_new_release(proj_info, request)
-    # else:
-    #     helpers.log_print("No Config for Project {}".format(project))
-    return restStatus(request, True)
-