From 82518c563e6855c43c211214891679ebe45fdc22 Mon Sep 17 00:00:00 2001 From: TBS093A Date: Fri, 9 Oct 2020 14:34:12 +0200 Subject: [PATCH] add dockerfile --- Dockerfile | 13 +++++++++++++ generalApp/AbstractCRUD.py | 12 +++++++++--- .../__pycache__/AbstractCRUD.cpython-36.pyc | Bin 7631 -> 7774 bytes generalApp/__pycache__/models.cpython-36.pyc | Bin 14478 -> 10420 bytes .../__pycache__/utilities.cpython-36.pyc | Bin 3804 -> 3864 bytes generalApp/utilities.py | 4 ++++ 6 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..7c2453d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM python:3.8 + +RUN python -m venv venv +RUN surce venv/bin/activate + +CMD ["mkdir", "application"] +WORKDIR /application + +RUN git clone git@github.com:TBS093A/trade-app-backend.git + +RUN ./packages.sh +RUN ./migrate.sh +RUN ./run.sh \ No newline at end of file diff --git a/generalApp/AbstractCRUD.py b/generalApp/AbstractCRUD.py index 744b165..c7f2333 100644 --- a/generalApp/AbstractCRUD.py +++ b/generalApp/AbstractCRUD.py @@ -3,6 +3,7 @@ from django.http import HttpResponse from datetime import datetime from .utilities import * + class ValidationUtils(): @classmethod @@ -12,6 +13,7 @@ class ValidationUtils(): class Meta: abstract = True + class AbstractUtilsCRUD(): """ This class have a primary utilities for CRUD functionality @@ -177,7 +179,7 @@ class AbstractUpdate(AbstractUtilsCRUD): @classmethod def putObject(self, request, objectID, privilige): object = jsonLoad(request) - if checkSession(request, privilige) and checkUserPermission(object, request): + if checkSession(request, privilige) or checkUserPermission(object, request): return self._updateObject(object, objectID) else: return HttpResponse("No Permission") @@ -201,7 +203,7 @@ class AbstractDelete(AbstractUtilsCRUD): @classmethod def deleteObject(self, request, objectID, privilige): objectDel = self._objectFactory().objects.get(pk = objectID) - if checkSession(request, privilige) and checkUserPermission(objectDel.toDict(), request): + if checkSession(request, privilige) or checkUserPermission(objectDel.toDict(), request): objectDel.delete() return HttpResponse(f"Delete Object: {objectDel}") else: @@ -213,11 +215,15 @@ class AbstractDelete(AbstractUtilsCRUD): class AbstractCRUD( models.Model, - ValidationUtils, AbstractGet, AbstractCreate, AbstractUpdate, AbstractDelete, ): + + @classmethod + def fromDict(self, dict): + self.__dict__.update(dict) + class Meta: abstract = True \ No newline at end of file diff --git a/generalApp/__pycache__/AbstractCRUD.cpython-36.pyc b/generalApp/__pycache__/AbstractCRUD.cpython-36.pyc index a8f39aa42499189fd493a788700952ccefd86b7c..bb050364714e139f1497a5e515b64bc0ff16d772 100644 GIT binary patch delta 1044 zcmZ8gO-NKx6!yHInfGSi(>KoOI5WO+W;AX5r_r&@{7FSkRE(l9O#GRGu!K9aDi?y# zA_%HOA|Yf%QbvIdw5UatP(ekTgm7VrwT>38g6N+2T2$|HKE8YJx%YhMocrGI-)bpM z=(GS7rlIGguCPIBK2uZk~w&B&Ru@J4Drhg4ppC$4UNL8J z$!EFtan?gtdjTQyP)Z|N^YltKY~^82BV={@B!CDF?WRDXGa^P zKn4AL{*qhT!NCfovVJQ}2x@e#VY@W?n4JS2duah`FxZm{DsC7)3_D3nUP%@f-C<)^q>> delta 1033 zcmZ8f-Afcv6yG!Z;q2_JJL|4H?ykD)XzFUNmY=EQ$NGVpD;hqe4~yLTC8q2tDdkuaH{P}ai1-7ZfQ*lY39x0s zJOJRuAM74E~h0stVd}A@CAZ6I2mI37QBRaYrZ%X`CM7 zb3x%Cnk|AwkPAeMEXoD4ooU%cXAYnq!Q;WSO9CCwyB=9P=zjK~au}>fI6a3+cgEVw z*)o20?>gG(xSgN_-xt*=okR_xUBt*+4P3^EXAh2|->X3nc6-aA4`;jqTR)k^@T}is z9pv-|qBjHm{9lDN3>UA$I&Kzg5hFn(w{E&%C?YMamtcs1uCrmv(%Q;t0;9elwBn-E zk4fJ>fz_g!cF0zdAj*qDruV_ti^KgLNepBeis1NYF=M6t0xBh$UYT zL%-1n_Iw|V&+GrS0vqM_&+&T6D!js0zozUbbDVsRl4f;;(}#R6h#aUgR1-F0=zr?J zE3jTX8EE6Gt_GSMhAQL9kKu5SQ4hqy7>gpI4AebEo9hiG83De8o;p7fWfj@ zXq%h~=`M`S;x|PYMvXo heJVDTyQ;!`R|XoQP-rjIl&CVMlqf|KSU~taegTsh)F1!= diff --git a/generalApp/__pycache__/models.cpython-36.pyc b/generalApp/__pycache__/models.cpython-36.pyc index c8d637e6384255dc5dd53a96ca5544b91c2ecafe..ce95a2b5d9d56fdc13c4d66b50e839af3b9e7017 100644 GIT binary patch literal 10420 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 literal 14478 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 N9eX@$m`Kft{{@-7zLx+1 delta 973 zcmah{%}*0i5Pxq!%G=#;F%hIq1S}BfBDGNYGDKk3JpLmt)jtT`e4GZdGTMEw@7u-Z^@pI>@uo zuQf^?m?O>KV3BtYVF1ln5EzenHTIEGu8KB;=6{0k+Wb<0s*PPPD{gC!V={eY5=7yt5bQiDup#$_e!*`v9->JA%|WTz0^b-pz+VPi*B*LU{6* z_Q+cFJvry!+HgHtz~llPCT^dNFDQ|*hT+xOdNsguV=aBW2=`lpV)t=}<0P4-s{a^E zWK?TjwL$gA_QgH>!bx`&mjzGs@JZMcjck1X&xuA>+<4BX%TuVzfvZM6|G$P-+;FDm ztpxrw92%twF55|~c`QWC;H1)mOp^!Ry!Yr*VaSZqw39l$?qqxiHjI; z6gdPpl6kv!>a+kalkXEF7?DL7u!r~tRP52waSBWj(Cl!gae($QGSW{H+nP3wkh81PTWaHT5WBmDk&x}!F*~sL4xEJc#-OK(&W-45;(3AVIu0n`UQD0vVi~q diff --git a/generalApp/utilities.py b/generalApp/utilities.py index 27612dd..e4c418a 100755 --- a/generalApp/utilities.py +++ b/generalApp/utilities.py @@ -22,6 +22,8 @@ def createToken(userDict): def checkSession(request, privilige): token = tryGetTokenFromRequest(request) + print( token ) + print( tokens ) for currentToken in tokens: if token == currentToken: if decodeToken(currentToken)['payload']['privilige'] >= privilige: @@ -70,6 +72,8 @@ def checkUserPermission(modelDict, request): token = tryGetTokenFromRequest(request) if modelIsNotUser(modelDict): + print( UserIsAdmin(token) ) + print( UserIsModer(token) ) if UserIsAdmin(token): return True elif UserIsModer(token):