Merge topic 'ExternalData-SecurityFix'

9b588b2b ExternalData: Hide security-sensitive details from output
This commit is contained in:
Brad King 2016-07-14 09:24:05 -04:00 committed by CMake Topic Stage
commit 6f36dce0cf
1 changed files with 2 additions and 1 deletions

View File

@ -971,7 +971,8 @@ function(_ExternalData_download_object name hash algo var_obj)
set(url "${lhs}${algo}${rhs}") set(url "${lhs}${algo}${rhs}")
endif() endif()
endif() endif()
message(STATUS "Fetching \"${url}\"") string(REGEX REPLACE "((https?|ftp)://)([^@]+@)?(.*)" "\\1\\4" secured_url "${url}")
message(STATUS "Fetching \"${secured_url}\"")
if(url MATCHES "^ExternalDataCustomScript://([A-Za-z_][A-Za-z0-9_]*)/(.*)$") if(url MATCHES "^ExternalDataCustomScript://([A-Za-z_][A-Za-z0-9_]*)/(.*)$")
_ExternalData_custom_fetch("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}" "${tmp}" err errMsg) _ExternalData_custom_fetch("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}" "${tmp}" err errMsg)
else() else()