Merge branch 'master' of https://github.com/biocore/qiita into dev

Author: Charles Cowart

qiita_core/support_files/config_test.cfg.enc

@@ -110,7 +110,16 @@ def validate_filepath_access_by_user(user, filepath_id):
         if arid:
             # [0] cause we should only have 1
             artifact = qdb.artifact.Artifact(arid[0])
+
             if artifact.visibility == 'public':
+                # TODO: https://github.com/biocore/qiita/issues/1724
+                if artifact.artifact_type in ['SFF', 'FASTQ', 'FASTA',
+                                              'FASTA_Sanger',
+                                              'per_sample_FASTQ']:
+                    study = artifact.study
+                    has_access = study.has_access(user, no_public=True)
+                    if (not study.public_raw_download and not has_access):
+                        return False
                 return True
             else:
                 study = artifact.study

qiita_db/meta_util.py

@@ -68,8 +68,18 @@ def test_validate_filepath_access_by_user(self):
         # Now shared has access to public study files
         self._set_artifact_public()
         for i in [1, 2, 3, 4, 5, 9, 12, 17, 18, 19, 20, 21]:
-            self.assertTrue(qdb.meta_util.validate_filepath_access_by_user(
-                user, i))
+            obs = qdb.meta_util.validate_filepath_access_by_user(user, i)
+            if i < 3:
+                self.assertFalse(obs)
+            else:
+                self.assertTrue(obs)
+
+        # testing that if study.public_raw_download is true we get access
+        qdb.study.Study(1).public_raw_download = True
+        for i in [1, 2, 3]:
+            obs = qdb.meta_util.validate_filepath_access_by_user(user, i)
+            self.assertTrue(obs)
+        qdb.study.Study(1).public_raw_download = False
 
         # Test that it doesn't break: if the SampleTemplate hasn't been added
         info = {
@@ -88,15 +98,21 @@ def test_validate_filepath_access_by_user(self):
         study = qdb.study.Study.create(
             qdb.user.User('[email protected]'), "Test study", info)
         for i in [1, 2, 3, 4, 5, 9, 12, 17, 18, 19, 20, 21]:
-            self.assertTrue(qdb.meta_util.validate_filepath_access_by_user(
-                user, i))
+            obs = qdb.meta_util.validate_filepath_access_by_user(user, i)
+            if i < 3:
+                self.assertFalse(obs)
+            else:
+                self.assertTrue(obs)
 
         # test in case there is a prep template that failed
         self.conn_handler.execute(
             "INSERT INTO qiita.prep_template (data_type_id) VALUES (2)")
         for i in [1, 2, 3, 4, 5, 9, 12, 17, 18, 19, 20, 21]:
-            self.assertTrue(qdb.meta_util.validate_filepath_access_by_user(
-                user, i))
+            obs = qdb.meta_util.validate_filepath_access_by_user(user, i)
+            if i < 3:
+                self.assertFalse(obs)
+            else:
+                self.assertTrue(obs)
 
         # admin should have access to everything
         admin = qdb.user.User('[email protected]')

qiita_db/test/test_meta_util.py

@@ -185,7 +185,9 @@ def artifact_summary_get_request(user, artifact_id):
                          'per_sample_FASTQ']:
         # If the artifact is one of the "raw" types, only the owner of the
         # study and users that has been shared with can see the files
-        if not artifact.study.has_access(user, no_public=True):
+        study = artifact.study
+        has_access = study.has_access(user, no_public=True)
+        if (not study.public_raw_download and not has_access):
             files = []
 
     proc_params = artifact.processing_parameters

qiita_pet/handlers/artifact_handlers/base_handlers.py

@@ -1,3 +1,3 @@
 set -e
 echo "** Testing EBI **"
-openssl aes-256-cbc -K $encrypted_bcdc06e5ae76_key -iv $encrypted_bcdc06e5ae76_iv -in qiita_core/support_files/config_test.cfg.enc -out qiita_core/support_files/config_test.cfg -d
+openssl aes-256-cbc -K $encrypted_079e536628f1_key -iv $encrypted_079e536628f1_iv -in qiita_core/support_files/config_test.cfg.enc -out qiita_core/support_files/config_test.cfg -d