diff options
author | Stan Hu <stanhu@gmail.com> | 2019-05-09 07:53:25 -0500 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-05-09 18:04:40 -0500 |
commit | e67481e079023e1319e91fabfb90b88c9a2b2655 (patch) | |
tree | 1b8536d97905bec416e18336e5dc439bc589919d /app/services | |
parent | 712dccd4c0f37b9fce12f5a945a551f8dca07cc4 (diff) | |
download | gitlab-ce-e67481e079023e1319e91fabfb90b88c9a2b2655.tar.gz |
Properly handle LFS Batch API response in project importsh-fix-lfs-download-errors
Project imports were failing with `undefined method each_with_object for
String` because the import was attempting to parse the LFS Batch API and
failing due to the fact that the Content-Type wasn't a supported format
(e.g. application/vnd.git-lfs+json instead of application/json). We now
parse the body as JSON.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61624
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/projects/lfs_pointers/lfs_download_link_list_service.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb b/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb index 05974948505..9b72480d18b 100644 --- a/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb +++ b/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb @@ -37,7 +37,17 @@ module Projects raise DownloadLinksError, response.message unless response.success? - parse_response_links(response['objects']) + # Since the LFS Batch API may return a Content-Ttpe of + # application/vnd.git-lfs+json + # (https://github.com/git-lfs/git-lfs/blob/master/docs/api/batch.md#requests), + # HTTParty does not know this is actually JSON. + data = JSON.parse(response.body) + + raise DownloadLinksError, "LFS Batch API did return any objects" unless data.is_a?(Hash) && data.key?('objects') + + parse_response_links(data['objects']) + rescue JSON::ParserError + raise DownloadLinksError, "LFS Batch API response is not JSON" end def parse_response_links(objects_response) |