/vsis3/: honour CPL_VSIL_CURL_ALLOWED_EXTENSIONS configuration option (…

…fixes OSGeo#995)
PPazderski · Oct 10, 2018 · 67ba5c6 · 67ba5c6
1 parent cdbba83
commit 67ba5c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/gdal/port/cpl_vsil_curl.cpp b/gdal/port/cpl_vsil_curl.cpp
@@ -2585,7 +2585,7 @@ const char* VSICurlFilesystemHandler::GetOptions()
 /*                        IsAllowedFilename()                           */
 /************************************************************************/
 
-static bool IsAllowedFilename( const char* pszFilename )
+bool VSICurlFilesystemHandler::IsAllowedFilename( const char* pszFilename )
 {
     const char* pszAllowedFilename =
         CPLGetConfigOption("CPL_VSIL_CURL_ALLOWED_FILENAME", nullptr);

diff --git a/gdal/port/cpl_vsil_curl_class.h b/gdal/port/cpl_vsil_curl_class.h
@@ -206,6 +206,8 @@ class VSICurlFilesystemHandler : public VSIFilesystemHandler
 
     static const char* GetOptionsStatic();
 
+    static bool IsAllowedFilename( const char* pszFilename );
+
 public:
     VSICurlFilesystemHandler();
     ~VSICurlFilesystemHandler() override;

diff --git a/gdal/port/cpl_vsil_s3.cpp b/gdal/port/cpl_vsil_s3.cpp
@@ -1414,6 +1414,10 @@ int IVSIS3LikeFSHandler::Stat( const char *pszFilename, VSIStatBufL *pStatBuf,
     if( !STARTS_WITH_CI(pszFilename, GetFSPrefix()) )
         return -1;
 
+    memset(pStatBuf, 0, sizeof(VSIStatBufL));
+    if( !IsAllowedFilename( pszFilename ) )
+        return -1;
+
     CPLString osFilename(pszFilename);
     if( osFilename.find('/', GetFSPrefix().size()) == std::string::npos )
         osFilename += "/";