PWL-751: require country field for institution PYTHON-V3

.dockerignore

@@ -0,0 +1,5 @@
+Dockerfile*
+docker-compose*
+.dockerignore
+.git
+.gitignore

Dockerfile

@@ -0,0 +1,17 @@
+FROM amazonlinux:2017.09.0.20170930
+
+RUN yum -y install vim httpd python36 python36-devel python36-pip wget gcc gcc-c++ subversion make uuid libuuid-devel httpd-devel mysql-devel
+# set python 3.6 as default version
+RUN alternatives --install /usr/bin/python python /usr/bin/python2.7 1 && alternatives --install /usr/bin/python python /usr/bin/python3.6 2 && alternatives --set python /usr/bin/python3.6
+RUN wget https://github.com/GrahamDumpleton/mod_wsgi/archive/4.5.15.tar.gz && tar -xvf 4.5.15.tar.gz && cd mod_wsgi-4.5.15 && ./configure --with-python=/usr/bin/python36 && make; make install && cd .. && rm -r mod_wsgi-4.5.15 4.5.15.tar.gz
+# configure settings.py as part of build process
+COPY docker_config/vhosts.conf /etc/httpd/conf.d/
+COPY docker_config/wsgi.conf /etc/httpd/conf.d/
+COPY dependencies.list /etc/
+RUN easy_install-3.6 pip && pip3 install --upgrade pip
+RUN pip3 install -r /etc/dependencies.list && rm /etc/dependencies.list
+# update this to pipe to AWS log later
+RUN mkdir /var/log/api && chown -R apache:apache /var/log/api
+RUN echo "ServerName 172.*" >> /etc/httpd/conf/httpd.conf
+EXPOSE 80
+CMD ["/usr/sbin/httpd","-D","FOREGROUND"]

apikey/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

apikey/serializers.py

@@ -1,6 +1,6 @@
 #Copyright 2015 Phoenix Bioinformatics Corporation. All rights reserved.
 
-from models import ApiKey
+from .models import ApiKey
 from rest_framework import serializers
 
 class ApiKeySerializer(serializers.ModelSerializer):

apikey/testSamples.py

@@ -1,12 +1,10 @@
 import django
-import unittest
-import sys, getopt
-from unittest import TestCase
-from models import ApiKey
+import sys
+from django.test import TestCase
+from .models import ApiKey
+from common.tests import TestGenericInterfaces
 
-from common.pyTests import PyTestGenerics
-
-genericForcePost = PyTestGenerics.forcePost
+genericForcePost = TestGenericInterfaces.forcePost
 
 class ApiKeySample():
     path = 'apikeys/'
@@ -15,13 +13,13 @@ class ApiKeySample():
         'apiKey':'proxyKey',
     }
     updateData = {
-        'apiKey':'proxy2Key',
+        'apiKey':'proxyKey2',
     }
     pkName = 'apiKeyId'
     model = ApiKey
 
     def __init__(self, serverUrl):
-        self.url = serverUrl+self.path
+        self.url = serverUrl + self.path
 
-    def forcePost(self,data):
+    def forcePost(self, data):
         return genericForcePost(self.model, self.pkName, data)

apikey/tests.py

@@ -1,3 +1,35 @@
+#Copyright 2015 Phoenix Bioinformatics Corporation. All rights reserved.                                                                                                                                  
+
+import django
+import unittest
+import sys
+import requests
+import json
 from django.test import TestCase
+from .models import ApiKey
+from .testSamples import ApiKeySample
+from common.tests import TestGenericInterfaces, GenericCRUDTest
+from http.cookies import SimpleCookie
+
+# Create your tests here.                                                                                                                                                                                 
+django.setup()
+serverUrl = TestGenericInterfaces.getHost()
+
+# ---------------------- UNIT TEST FOR BASIC CRUD OPERATIONS -------------
+
+class ApiKeyCRUD(GenericCRUDTest, TestCase):
+    sample = ApiKeySample(serverUrl)
+
+    def test_for_get_all(self):
+        url = self.getUrl(self.sample.url)
+        self.getAllHelper(url, 'apiKey', self.apiKey)
+
+# ----------------- END OF BASIC CRUD OPERATIONS ----------------------
+
+print("Running unit tests on API key web services API.........")
 
-# Create your tests here.
+if __name__ == '__main__':
+    sys.argv[1:] = []
+    unittest.main()
+    ret = not runner.run(suite).wasSuccessful()
+    sys.exit(ret)

apikey/views.py

@@ -3,8 +3,8 @@
 from django.http import HttpResponse
 from rest_framework import generics
 
-from models import ApiKey
-from serializers import ApiKeySerializer
+from .models import ApiKey
+from .serializers import ApiKeySerializer
 
 import json
 

authentication/manualTests.py

@@ -0,0 +1,38 @@
+#Copyright 2015 Phoenix Bioinformatics Corporation. All rights reserved.                                                                                                                                  
+
+import django
+import unittest
+import sys
+import json
+from django.test import TestCase, Client
+from partner.testSamples import PartnerSample
+from party.testSamples import UserPartySample
+from common.tests import TestGenericInterfaces, GenericTest
+from .testSamples import CredentialSample
+from .tests import CredentialGenericTest
+from http.cookies import SimpleCookie
+from django.test.utils import override_settings
+
+# Create your tests here.                                                                                                                                                                                 
+django.setup()
+serverUrl = TestGenericInterfaces.getHost()
+
+# test for API endpoint /credentials/resetPwd/
+@override_settings(EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend')
+class ResetPasswordTest(CredentialGenericTest):
+
+    def test_for_reset_password(self):
+        url = '%scredentials/resetPwd/?user=%s&partnerId=%s' % (serverUrl, self.sample.getUsername(), self.partnerId)
+
+        # the default content type for put is 'application/octet-stream'
+        # does not test for partyId update
+        res = self.client.put(url, None, content_type='application/json')
+        self.assertEqual(res.status_code, 200)        
+
+print("Running unit tests on authentication/credential reset password web services API.........")
+
+if __name__ == '__main__':
+    sys.argv[1:] = []
+    unittest.main()
+    ret = not runner.run(suite).wasSuccessful()
+    sys.exit(ret)

authentication/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('gmail', models.CharField(max_length=128, db_index=True)),
-                ('partyId', models.ForeignKey(to='party.Party')),
+                ('partyId', models.ForeignKey(to='party.Party', on_delete=models.PROTECT)),
             ],
             options={
                 'db_table': 'GoogleEmail',
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
                 ('password', models.CharField(max_length=32)),
                 ('email', models.CharField(max_length=128, null=True)),
                 ('institution', models.CharField(max_length=64, null=True)),
-                ('partyId', models.ForeignKey(to='party.Party', db_column=b'partyId')),
+                ('partyId', models.ForeignKey(to='party.Party', db_column='partyId', on_delete=models.PROTECT)),
             ],
             options={
                 'db_table': 'User',

authentication/migrations/0002_auto_20150806_1926.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='user',
             name='partnerId',
-            field=models.ForeignKey(db_column=b'partnerId', default='test', to='partner.Partner'),
+            field=models.ForeignKey(db_column='partnerId', default='test', to='partner.Partner', on_delete=models.PROTECT),
             preserve_default=False,
         ),
         migrations.AddField(

authentication/migrations/0003_auto_20150821_2103.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

authentication/migrations/0004_credential_name.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

authentication/migrations/0005_Credentials_institution_length_64_200.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 

authentication/migrations/0006_Credential_tbl_drop_name_column_PW-161.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 

authentication/migrations/0007_lname_and_fname_in_credential.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

authentication/migrations/0008_auto_20160820_1956.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

authentication/models.py

@@ -14,35 +14,44 @@ class Credential(models.Model):
   password = models.CharField(max_length=64)
   email = models.CharField(max_length=254, null=True)
   institution = models.CharField(max_length=200, null=True)#PW-254
-  partyId = models.ForeignKey(Party, db_column='partyId')
-  partnerId = models.ForeignKey(Partner, db_column='partnerId')
+  partyId = models.ForeignKey(Party, db_column='partyId', on_delete=models.PROTECT)
+  partnerId = models.ForeignKey(Partner, db_column='partnerId', on_delete=models.PROTECT)
   userIdentifier = models.CharField(max_length=32, null=True)
   #name = models.CharField(max_length=64, null=True) vet PW-161
-  
+
   @staticmethod
   def validate(partyId, secretKey):
     if partyId and secretKey and partyId.isdigit() and Party.objects.filter(partyId=partyId).exists():
       pu = Party.objects.filter(partyId=partyId)
       if Credential.objects.filter(partyId_id__in=pu.values('partyId')).exists():
         usu = Credential.objects.filter(partyId_id__in=pu.values('partyId')).first()
-        digested = base64.b64encode(hmac.new(str(partyId).encode('ascii'), usu.password.encode('ascii'), hashlib.sha1).digest())
+        digested = Credential.generateSecretKey(partyId, usu.password)
         if digested == secretKey:
           return True
       #TODO: validation still fail
       pu = pu.first().consortiums.all()
       if Credential.objects.filter(partyId_id__in=pu.values('partyId')).exists():
         for usu in Credential.objects.filter(partyId_id__in=pu.values('partyId')):
-          digested = base64.b64encode(hmac.new(str(usu.partyId).encode('ascii'), usu.password.encode('ascii'), hashlib.sha1).digest())
+          digested = Credential.generateSecretKey(usu.partyId, usu.password)
           if digested == secretKey:
             return True
     return False
 
+  @staticmethod
+  def generatePasswordHash(password):
+    return hashlib.sha1(password.encode()).hexdigest()
+
+  @staticmethod
+  def generateSecretKey(partyId, password):
+    encoded = base64.b64encode(hmac.new(str(partyId).encode('ascii'), password.encode('ascii'), hashlib.sha1).digest())
+    return encoded.decode()
+
   class Meta:
     db_table = "Credential"
     unique_together = ("username","partnerId")
 
 class GooglePartyAffiliation(models.Model):
   gmail = models.CharField(max_length=128, db_index=True)
-  partyId = models.ForeignKey(Party)
+  partyId = models.ForeignKey(Party, on_delete=models.PROTECT)
   class Meta:
     db_table = "GoogleEmail"