Merge lp:~zorba-coders/zorba/staticcontextentityresolver-ignores-deny-access into lp:zorba

[Dennis Knochenwefel]

added a check and rethrow for error zerr::ZXQP0029_URI_ACCESS_DENIED when importing schemas

fix for bug #984759 (StaticContextEntityResolver ignores deny_access)

[lp:~zorba-coders/zorba/staticcontextentityresolver-ignores-deny-access]

10776. By Chris Hillery on 2012-04-24

Add test case demonstrating fix for bug 984759.

[Chris Hillery (ceejatec)]

review: Approve

[Chris Hillery (ceejatec)]

I've added a test case and a commit message. Dennis, you should add an "Approve" review comment so it can clear the remote queue.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/staticcontextentityresolver-ignores-deny-access-2012-04-24T10-27-59.764Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job staticcontextentityresolver-ignores-deny-access-2012-04-24T10-27-59.764Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/types/schema/schema.cpp'
--- src/types/schema/schema.cpp	2012-04-23 10:46:38 +0000
+++ src/types/schema/schema.cpp	2012-04-24 10:21:21 +0000
@@ -255,15 +255,17 @@
         else
           return NULL;          
       }
-// avoiding the warning that e is not used
-#ifdef DO_TRACE
       catch (ZorbaException const& e) {
         TRACE("!!! ZorbaException: " << e );
-#else
-      catch (ZorbaException const& ) {
-#endif
-        //don't throw let Xerces resolve it
-        return NULL;
+        if ( e.diagnostic() == zerr::ZXQP0029_URI_ACCESS_DENIED )
+        {
+          throw;
+        }
+        else
+        {
+          //don't throw let Xerces resolve it
+          return NULL;
+        }
       }
     }
   }
 
=== modified file 'test/api/CMakeLists.txt'
--- test/api/CMakeLists.txt	2012-04-23 10:46:38 +0000
+++ test/api/CMakeLists.txt	2012-04-24 10:21:21 +0000
@@ -37,7 +37,12 @@
 FOREACH (test ${TestsToRun})
   GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
   SET (TestName "test/api/${TName}")
-  ZORBA_ADD_TEST(${TestName} APITests ${TName})
+  ZORBA_ADD_TEST(${TestName} APITests ${TName}
+    "${CMAKE_BINARY_DIR}/TEST_URI_PATH")
 ENDFOREACH(test)
 
+# Add importing schema for userdefined_uri_resolution test
+DECLARE_ZORBA_SCHEMA(FILE import-hello.xsd
+  URI http://www.zorba-xquery.com/import-hello TEST_ONLY)
+
 EXPECTED_FAILURE(test/api/test_static_context 3118348)
 
=== added file 'test/api/import-hello.xsd'
--- test/api/import-hello.xsd	1970-01-01 00:00:00 +0000
+++ test/api/import-hello.xsd	2012-04-24 10:21:21 +0000
@@ -0,0 +1,7 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.zorba-xquery.com/import-hello"
+    targetNamespace="http://www.zorba-xquery.com/import-hello"
+    elementFormDefault="qualified">
+  <xs:import schemaLocation="http://www.zorba-xquery.com/tutorials/helloworld.xsd"/>
+</xs:schema>
+
 
=== modified file 'test/api/userdefined_uri_resolution.cpp'
--- test/api/userdefined_uri_resolution.cpp	2012-04-23 10:46:38 +0000
+++ test/api/userdefined_uri_resolution.cpp	2012-04-24 10:21:21 +0000
@@ -82,7 +82,8 @@
     EntityData const* aEntityData,
     std::vector<zorba::String>& oUris) throw ()
   {
-    if(aUri == "http://www.zorba-xquery.com/to-be-denied") {
+    // Deny access to an URI that would otherwise work
+    if(aUri == "http://www.zorba-xquery.com/tutorials/helloworld.xsd") {
       oUris.push_back(URIMapper::DENY_ACCESS);
     }
   }
@@ -208,8 +209,7 @@
   }
   catch (ZorbaException& e) {
     std::cerr << e.what() << std::endl;
-    return false;
-  }
+    return false;  }
   return true;
 }
 
@@ -269,7 +269,7 @@
   try {
     XQuery_t lQuery = aZorba->compileQuery
       ("import schema namespace lm="
-        "'http://www.zorba-xquery.com/to-be-denied'; "
+        "'http://www.zorba-xquery.com/tutorials/helloworld.xsd'; "
         "validate{ <p>Hello World!</p> }", lContext);
     std::cout << lQuery << std::endl;
   } catch (ZorbaException& e) {
@@ -282,11 +282,44 @@
   return false;
 }
 
+bool test_deny_access_import(Zorba* aZorba, char* aUriPath)
+{
+  StaticContext_t lContext = aZorba->createStaticContext();
+
+  DenyAccessURIMapper lMapper;
+  lContext->registerURIMapper(&lMapper);
+
+  try {
+    // Import a schema which imports the denied URI - need to use StaticContext
+    // to set the URI path for this. Merely importing this schema should fail.
+    std::vector<zorba::String> lUriPath;
+    lUriPath.push_back(aUriPath);
+    lContext->setURIPath(lUriPath);
+    XQuery_t lQuery = aZorba->compileQuery
+      ("import schema namespace lm="
+        "'http://www.zorba-xquery.com/import-hello'; "
+        "1", lContext);
+    std::cout << lQuery << std::endl;
+  } catch (ZorbaException& e) {
+    std::cout << "Caught exception: " << e.what() << std::endl;
+    if (e.diagnostic() == zerr::ZXQP0029_URI_ACCESS_DENIED) {
+      std::cout << "...the correct exception!" << std::endl;
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
  * Main test entry point
  */
 int userdefined_uri_resolution(int argc, char* argv[])
 {
+  if (argc != 2) {
+    std::cout << "Incorrect arguments passed to userdefined_uri_resolution()"
+              << std::endl;
+    return 1;
+  }
   void* lStore = StoreManager::getStore();
   Zorba* lZorba = Zorba::getInstance(lStore); 
 
@@ -328,6 +361,12 @@
     std::cout << " ... failed!" << std::endl;
   }
 
+  std::cout << "test_deny_access_import" << std::endl;
+  if (!test_deny_access_import(lZorba, argv[1])) {
+    retval = 1;
+    std::cout << " ... failed!" << std::endl;
+  }
+
   lZorba->shutdown();
   zorba::StoreManager::shutdownStore(lStore);
   return retval;