[Cmake-commits] CMake branch, next, updated. v3.6.0-830-gd74b003

Brad King brad.king at kitware.com
Wed Jul 13 11:52:44 EDT 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d74b00328fb8c51ca3e1f06114fbd3aa72472901 (commit)
       via  9b588b2bdfc93d5cb0fe0c1753971e987addf68a (commit)
      from  fad84ee6e436fe2fe820dc58a22f6b84eab618e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d74b00328fb8c51ca3e1f06114fbd3aa72472901
commit d74b00328fb8c51ca3e1f06114fbd3aa72472901
Merge: fad84ee 9b588b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 13 11:52:43 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 13 11:52:43 2016 -0400

    Merge topic 'ExternalData-SecurityFix' into next
    
    9b588b2b ExternalData: Hide security-sensitive details from output


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b588b2bdfc93d5cb0fe0c1753971e987addf68a
commit 9b588b2bdfc93d5cb0fe0c1753971e987addf68a
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Wed Jul 13 18:23:29 2016 +0300
Commit:     Alex Turbov <i.zaufi at gmail.com>
CommitDate: Wed Jul 13 18:41:57 2016 +0300

    ExternalData: Hide security-sensitive details from output
    
    Do not disclose credentials when printing URIs used to fetch external resources.

diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake
index a3f460d..02d2b15 100644
--- a/Modules/ExternalData.cmake
+++ b/Modules/ExternalData.cmake
@@ -971,7 +971,8 @@ function(_ExternalData_download_object name hash algo var_obj)
         set(url "${lhs}${algo}${rhs}")
       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_]*)/(.*)$")
       _ExternalData_custom_fetch("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}" "${tmp}" err errMsg)
     else()

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalData.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list