Fence (branch master)

• 

  Luigi Marini 26 Jun 2017 7762b3b69bf38254b069ec6968a7f5f4a94417db

  Updated changelog.

  • CHANGELOG.md (version 7762b3b69bf38254b069ec6968a7f5f4a94417db) (diffs)
• 

  Luigi Marini 23 Jun 2017 3e8c482dba8b82173c0c5b308396887d8138a304

  Updated changelog.

  • CHANGELOG.md (version 3e8c482dba8b82173c0c5b308396887d8138a304) (diffs)
• 

  Luigi Marini 23 Jun 2017 98b607c0498f634ca48db434fa0c18c0fd2f260c

  Merge branch 'master' into develop
  # Conflicts:
  #        runtest.sh
  #        src/test/python/README.md
  #        src/test/python/test_conversion_data.yml
  #        src/test/python/test_extraction_data.yml
• 

  Luigi Marini 23 Jun 2017 250aafb1d6a78455a117d6c5b315377420b0fdd5 m

  Updated swagger definitions. Added missing endpoints.

  • src/main/resources/swagger.json (version 250aafb1d6a78455a117d6c5b315377420b0fdd5) (diffs)
  • src/main/resources/swagger.yaml (version 250aafb1d6a78455a117d6c5b315377420b0fdd5) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version 250aafb1d6a78455a117d6c5b315377420b0fdd5) (diffs)
• 

  Luigi Marini 07 Jun 2017 0c6bcf77a7e973456ce76eba67232a573b7548ac m

  Merge pull request #100 in BD/fence from feature/BD-1641-only-users-who-submit-a-resource to develop
  * commit '88bdffe54d57e80b41cce6c76326ae77b2dcb8de':
    Store resource_id for each file or url submission and use that to moderate access to outputs. Added a few endpoints. Removed tokenFilter from /ok endpoint. Always set Content-Type: application/json for extractions/url.
• 

  Luigi Marini 06 Jun 2017 88bdffe54d57e80b41cce6c76326ae77b2dcb8de m

  Store resource_id for each file or url submission and use that to moderate access to outputs. Added a few endpoints. Removed tokenFilter from /ok endpoint. Always set Content-Type: application/json for extractions/url.

  • src/main/scala/edu/illinois/ncsa/fence/Clowder.scala (version 88bdffe54d57e80b41cce6c76326ae77b2dcb8de) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Crowd.scala (version 88bdffe54d57e80b41cce6c76326ae77b2dcb8de) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Polyglot.scala (version 88bdffe54d57e80b41cce6c76326ae77b2dcb8de) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Redis.scala (version 88bdffe54d57e80b41cce6c76326ae77b2dcb8de) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version 88bdffe54d57e80b41cce6c76326ae77b2dcb8de) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/auth/ResourceAuthFilter.scala (version 88bdffe54d57e80b41cce6c76326ae77b2dcb8de) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/db/Mongodb.scala (version 88bdffe54d57e80b41cce6c76326ae77b2dcb8de) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/models/Event.scala (version 88bdffe54d57e80b41cce6c76326ae77b2dcb8de) (diffs)
• 

  Luigi Marini 31 May 2017 268a9ea5961dc0c1ccbf63973bc38bc5b3166f3a m

  Merge pull request #99 in BD/fence from BD-1625-load-application.conf-using-docker to develop
  * commit 'c3a3a9a39359af178269664de05b52e420a357bc':
    Use docker volume to load application.conf. Also link to external redis and mongodb containers.
• 

  Luigi Marini 30 May 2017 bf49f2d6271c5481e921ad7aa268e9893964a4ee m

  Merge pull request #98 in BD/fence from bugfix/BD-1540-extract-file-name-when-uploading to develop
  * commit '4ced43ae24e949832a58aab2faaae28ee47565f7':
    Store Polyglot and Clowder file id as a Uniform Resource Name (URN) in events in the case of a file manually uploaded (instead of a URL).
• 

  Luigi Marini 30 May 2017 4ced43ae24e949832a58aab2faaae28ee47565f7 m

  Store Polyglot and Clowder file id as a Uniform Resource Name (URN) in events in the case of a file manually uploaded (instead of a URL).

  • src/main/scala/edu/illinois/ncsa/fence/Clowder.scala (version 4ced43ae24e949832a58aab2faaae28ee47565f7) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Polyglot.scala (version 4ced43ae24e949832a58aab2faaae28ee47565f7) (diffs)
• 

  Luigi Marini 24 May 2017 4bab8ceafba96474e65c7d3e23e536c40bc89220 m

  Merge pull request #97 in BD/fence from feature/BD-1634-admin-credentials-for-admin-endpoints to develop
  * commit '82e60cda279f6b46bd962f61cb2c1e94965e42cc':
    Added admin authorization filter. Admins are specified in the conf file. Used filter to protect /events and /stats endpoints.
• 

  Luigi Marini 24 May 2017 8cc8945d818020f1a4b5a425d2fbcc3d2b21be3b m

  Merge pull request #96 in BD/fence from feature/BD-1597-configure-datawolf-account to develop
  * commit '1e47b24d0e40f3637dc4fe48ea1f6e7f4b1fba92':
    BD-1597 added datawolf account to reference.conf file, added datawolf catch all method to forward requests to datawolf and modified the datawolf requests to send the configured account in the authorization header
• 

  Luigi Marini 23 May 2017 82e60cda279f6b46bd962f61cb2c1e94965e42cc m

  Added admin authorization filter. Admins are specified in the conf file. Used filter to protect /events and /stats endpoints.

  • src/main/resources/reference.conf (version 82e60cda279f6b46bd962f61cb2c1e94965e42cc) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version 82e60cda279f6b46bd962f61cb2c1e94965e42cc) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/auth/AdminAuth.scala (version 82e60cda279f6b46bd962f61cb2c1e94965e42cc) (diffs)
• 

  Luigi Marini 19 May 2017 93e746cefd7e2ecb6c60e52168c9de2834991da8 m

  Added GET http://localhost:8080/conversions/path/pdf/nc

  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version 93e746cefd7e2ecb6c60e52168c9de2834991da8) (diffs)
• 

  Luigi Marini 18 May 2017 2dfa5901f08828a7181c9a629b51b0ca77206fbc m

  Swagger authentication default to token. Fixed list extractors by mime type definition.

  • src/main/resources/swagger.json (version 2dfa5901f08828a7181c9a629b51b0ca77206fbc) (diffs)
  • src/main/resources/swagger.yaml (version 2dfa5901f08828a7181c9a629b51b0ca77206fbc) (diffs)
• 

  Luigi Marini 18 May 2017 a530e138bf86111c33b55721a383973310544ead m

  Fix swagger host url.

  • src/main/resources/swagger.json (version a530e138bf86111c33b55721a383973310544ead) (diffs)
  • src/main/resources/swagger.yaml (version a530e138bf86111c33b55721a383973310544ead) (diffs)
• 

  Luigi Marini 17 May 2017 c3a3a9a39359af178269664de05b52e420a357bc m

  Use docker volume to load application.conf. Also link to external redis and mongodb containers.

  • README.md (version c3a3a9a39359af178269664de05b52e420a357bc) (diffs)
  • docker.sh (version c3a3a9a39359af178269664de05b52e420a357bc) (diffs)
  • docker/Dockerfile (version c3a3a9a39359af178269664de05b52e420a357bc) (diffs)
  • entrypoint.sh (version c3a3a9a39359af178269664de05b52e420a357bc) (diffs)
  • src/main/resources/docker.conf (version c3a3a9a39359af178269664de05b52e420a357bc) (diffs)
• 

  Christopher Navarro 15 May 2017 1e47b24d0e40f3637dc4fe48ea1f6e7f4b1fba92 m

  BD-1597 added datawolf account to reference.conf file, added datawolf catch all method to forward requests to datawolf and modified the datawolf requests to send the configured account in the authorization header

  • src/main/resources/reference.conf (version 1e47b24d0e40f3637dc4fe48ea1f6e7f4b1fba92) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Datawolf.scala (version 1e47b24d0e40f3637dc4fe48ea1f6e7f4b1fba92) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version 1e47b24d0e40f3637dc4fe48ea1f6e7f4b1fba92) (diffs)
• 

  Luigi Marini 11 May 2017 5c55f5b1e5c22d956543a40de81ee2b03d2f07f1 m

  Removed runtest.sh.

  • runtest.sh (version 5c55f5b1e5c22d956543a40de81ee2b03d2f07f1) (diffs)
• 

  Luigi Marini 10 May 2017 1274cb147bb313503d91ed997fc221d7bd46aa12 m

  Merge branch 'develop' into feature/BD-739-implement-improved-endpoints-in-api
  # Conflicts:
  #        src/main/scala/edu/illinois/ncsa/fence/Server.scala
  #        src/test/python/test_conversion.py
  #        src/test/python/test_extraction.py
• 

  Luigi Marini 10 May 2017 1e2e951488281523df4aee3baf790330114010f0 m

  Updated swagger.json and swagger.yaml.

  • src/main/resources/swagger.json (version 1e2e951488281523df4aee3baf790330114010f0) (diffs)
  • src/main/resources/swagger.yaml (version 1e2e951488281523df4aee3baf790330114010f0) (diffs)
• 

  Luigi Marini 10 May 2017 dffbe2b16f567a7134f4bd6487c5283ffe55eaed m

  GET /tokens/:id doesn't require authentication anymore. Changed POST /extractions/upload_url to POST /extractions/url. Changed POST /extractions/upload_file to POST /extractions/file. Fixed GET /extractions/:id/status. Added GET extractions/files/fileId/metadata.

  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version dffbe2b16f567a7134f4bd6487c5283ffe55eaed) (diffs)
• 

  Rob Kooper 06 May 2017 b973ed06c31b13d4b147bec5909ffb117b855880 m

  moved to bd-test repo

  • src/main/web/tests/bd.php (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/main/web/tests/graph.html (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/main/web/tests/report.html (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/main/web/tests/results.html (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/.gitignore (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/README.md (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/conftest.py (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/junit2html.xsl (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/post_results.py (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/requirements.txt (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/test_conversion.py (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/test_conversion_data.yml (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/test_extraction.py (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/test_extraction_data.yml (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/test_input_output_graph.py (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/test_keys_tokens.py (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/util.py (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
  • src/test/python/watchers.yml (version b973ed06c31b13d4b147bec5909ffb117b855880) (diffs)
• 

  Rob Kooper 06 May 2017 c8b6db4d00d4b6f2753de3292f50300a497d0c6b m

  pep8 cleanup

  • src/test/python/conftest.py (version c8b6db4d00d4b6f2753de3292f50300a497d0c6b) (diffs)
  • src/test/python/post_results.py (version c8b6db4d00d4b6f2753de3292f50300a497d0c6b) (diffs)
  • src/test/python/test_conversion.py (version c8b6db4d00d4b6f2753de3292f50300a497d0c6b) (diffs)
  • src/test/python/test_extraction.py (version c8b6db4d00d4b6f2753de3292f50300a497d0c6b) (diffs)
  • src/test/python/test_input_output_graph.py (version c8b6db4d00d4b6f2753de3292f50300a497d0c6b) (diffs)
• 

  Rob Kooper 06 May 2017 4538c231421cca9d18811201ccd2441aefd7f8b6 m

  fix missing imports, pep8 compliance

  • src/test/python/util.py (version 4538c231421cca9d18811201ccd2441aefd7f8b6) (diffs)
• 

  Bing Zhang 26 Apr 2017 f8624edd09419a0e9fa07c6cd64d03ac2bef7460 m

  resolve conflicts
• 

  Luigi Marini 26 Apr 2017 32b17e56e240f136db7ddab8f54e00b739a232c2 m

  Serve swagger.yaml as well as swagger.json.

  • src/main/resources/swagger.yaml (version 32b17e56e240f136db7ddab8f54e00b739a232c2) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version 32b17e56e240f136db7ddab8f54e00b739a232c2) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/util/Files.scala (version 32b17e56e240f136db7ddab8f54e00b739a232c2) (diffs)
• 

  Sandeep Puthanveetil Satheesan 21 Apr 2017 3243d72b8d28c151f4cf868024cab28e738ca124 m

  Added fix for timeout issue with test_get_input

  • src/test/python/test_input_output_graph.py (version 3243d72b8d28c151f4cf868024cab28e738ca124) (diffs)
• 

  Sandeep Puthanveetil Satheesan 19 Apr 2017 3056fbe6c959511f27e444c771ad1c12bc43eafe m

  Renamed timeout variable to request_timeout and added a new variable processing_timeout to keep track of extractions and conversions.

  • src/test/python/test_extraction.py (version 3056fbe6c959511f27e444c771ad1c12bc43eafe) (diffs)
  • src/test/python/test_input_output_graph.py (version 3056fbe6c959511f27e444c771ad1c12bc43eafe) (diffs)
  • src/test/python/test_keys_tokens.py (version 3056fbe6c959511f27e444c771ad1c12bc43eafe) (diffs)
• 

  Sandeep Puthanveetil Satheesan 19 Apr 2017 6a203332cb4bda478fd41c296552c2fed8a4cdb0 m

  1. Renamed timeout variable to request_timeout and added a new variable processing_timeout to keep track of extractions and conversions 2. Moved download_file method from conftest.py to test_conversion.py 3. Using processing_timeout in download_file method (earlier this was being used as a decrementing counter)

  • src/test/python/conftest.py (version 6a203332cb4bda478fd41c296552c2fed8a4cdb0) (diffs)
  • src/test/python/test_conversion.py (version 6a203332cb4bda478fd41c296552c2fed8a4cdb0) (diffs)
• 

  Bing Zhang 11 Apr 2017 e281e5db763dfc7c8ca338fdccb9aed288ec8feb m

  fix Accept field in headers

  • src/test/python/test_conversion.py (version e281e5db763dfc7c8ca338fdccb9aed288ec8feb) (diffs)
• 

  Bing Zhang 10 Apr 2017 95a41830f5ee57a362993bd7bfcb78d5da5f4fea m

  resolve conflicts
• 

  Luigi Marini 03 Apr 2017 05eb6712dd119f010b9f3b809e5de7d35e37e69c m

  Switched tests to use new API. Also added new service for supporting Options HTTP verb.

  • src/main/scala/edu/illinois/ncsa/fence/Polyglot.scala (version 05eb6712dd119f010b9f3b809e5de7d35e37e69c) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version 05eb6712dd119f010b9f3b809e5de7d35e37e69c) (diffs)
  • src/test/python/test_conversion.py (version 05eb6712dd119f010b9f3b809e5de7d35e37e69c) (diffs)
  • src/test/python/test_extraction.py (version 05eb6712dd119f010b9f3b809e5de7d35e37e69c) (diffs)
• 

  Luigi Marini 24 Mar 2017 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7 m

  Major cleanup of Server.scala by moving most of the Service definitions to standalone objects.

  • src/main/scala/edu/illinois/ncsa/fence/Auth.scala (version 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Clowder.scala (version 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Datawolf.scala (version 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Events.scala (version 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Polyglot.scala (version 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/Server.scala (version 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/util/Clowder.scala (version 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/util/Services.scala (version 019e459d7e92b1aff5f96c0b5288fc4def9f7ab7) (diffs)
• 

  Bing Zhang 23 Mar 2017 12b845c488b26e725bbdf3dd6e369e7e0fa69efa m

  add download filed. remove file_path url. remove temp files

  • src/test/python/test_conversion.py (version 12b845c488b26e725bbdf3dd6e369e7e0fa69efa) (diffs)
  • src/test/python/test_extraction.py (version 12b845c488b26e725bbdf3dd6e369e7e0fa69efa) (diffs)
  • src/test/python/util.py (version 12b845c488b26e725bbdf3dd6e369e7e0fa69efa) (diffs)
• 

  Luigi Marini 22 Mar 2017 8fb43faee8dcb6993f8b7137119fd390b265ffa5 m

  Combined utils into util package.

  • src/main/scala/edu/illinois/ncsa/fence/util/Files.scala (version 8fb43faee8dcb6993f8b7137119fd390b265ffa5) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/util/TwitterFutures.scala (version 8fb43faee8dcb6993f8b7137119fd390b265ffa5) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/utils/Files.scala (version 8fb43faee8dcb6993f8b7137119fd390b265ffa5) (diffs)
  • src/main/scala/edu/illinois/ncsa/fence/utils/TwitterFutures.scala (version 8fb43faee8dcb6993f8b7137119fd390b265ffa5) (diffs)
• 

  Bing Zhang 16 Mar 2017 47de5a9b49bbc45289195f0a3d23fec29c33906b m

  remove extra skip

  • src/test/python/test_extraction.py (version 47de5a9b49bbc45289195f0a3d23fec29c33906b) (diffs)
• 

  Bing Zhang 16 Mar 2017 7833c433a01c156bf724a78bf8e45827e2f26d40 m

  init commit

  • src/test/python/test_conversion.py (version 7833c433a01c156bf724a78bf8e45827e2f26d40) (diffs)
  • src/test/python/test_extraction.py (version 7833c433a01c156bf724a78bf8e45827e2f26d40) (diffs)
  • src/test/python/util.py (version 7833c433a01c156bf724a78bf8e45827e2f26d40) (diffs)