Merge pull request openwisp#61 from shashwat1002/issue#34_autgen_cert

[x509] Fix certificates without organization assigned openwisp#34

.travis.yml

@@ -39,7 +39,7 @@ install:
   - pipenv install $DJANGO
   # fix issues with travis
   - pipenv install --skip-lock "attrs>=17.4.0"
-  - pipenv install --skip-lock "six>=1.11.0"
+  - pipenv install --skip-lock "six"
   # TODO: temporary, remove when django-netjsonconfig 0.9.0 is released
   - if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then pipenv install git+git://github.com/tinio/pysqlite.git@extension-enabled#egg=pysqlite; fi
   - pipenv run pip install https://github.com/openwisp/django-x509/tarball/master

openwisp_controller/config/models.py

@@ -192,7 +192,7 @@ def _auto_create_cert_extra(self, cert):
         """
         sets the organization on the created client certificate
         """
-        cert.organization = self.vpn.organization
+        cert.organization = self.config.device.organization
         return cert
 
 

openwisp_controller/config/tests/test_template.py

@@ -94,3 +94,18 @@ def test_auto_client_template_default(self):
                               vpn=vpn,
                               config={})
         self._create_config(organization=org)
+
+    def test_auto_generated_certificate_for_organization(self):
+        organization = self._create_org()
+        vpn = self._create_vpn()
+        template = self._create_template(type='vpn', auto_cert=True, vpn=vpn)
+        corresponding_device = self._create_device(organization=organization,)
+        config = self._create_config(
+            device=corresponding_device,
+            organization=corresponding_device.organization
+        )
+        config.templates.add(template)
+        vpn_clients = config.vpnclient_set.all()
+        for vpn_client in vpn_clients:
+            self.assertIsNotNone(vpn_client.cert.organization)
+            self.assertEqual(vpn_client.cert.organization, config.device.organization)