File libcmis-0.3.1.patch of Package mingw32-cmis-client

Overview Repositories Revisions Requests Users Attributes Meta

File libcmis-0.3.1.patch of Package mingw32-cmis-client (Revision a8345835674afd7def04fc45f1be9422)

Currently displaying revision a8345835674afd7def04fc45f1be9422 , Show latest

--- src/libcmis-c/Makefile.am
+++ src/libcmis-c/Makefile.am
@@ -36,6 +36,7 @@ libcmis_c_@LIBCMIS_API_VERSION@_la_SOURCES = \
 libcmis_c_@LIBCMIS_API_VERSION@_la_LDFLAGS = -export-dynamic -no-undefined -version-info 3:1:0
 
 libcmis_c_@LIBCMIS_API_VERSION@_la_LIBADD = \
+	../libcmis/libcmis-@LIBCMIS_API_VERSION@.la \
 	$(XML2_LIBS) \
 	$(CURL_LIBS) \
 	$(BOOST_SMART_PTR_LIBS) \
--- src/libcmis-c/test-document.cxx
+++ src/libcmis-c/test-document.cxx
@@ -53,8 +53,8 @@ namespace
         rewind( file );
 
         char* buf = new char[size + 1];
-        fread( buf, 1, size, file );
-        buf[ size ] = '\0';
+        size_t readbytes = fread( buf, 1, size, file );
+        buf[ readbytes ] = '\0';
 
         string result( buf );
         delete[] buf;
--- src/libcmis/Makefile.am
+++ src/libcmis/Makefile.am
@@ -67,7 +67,7 @@ libcmis_@LIBCMIS_API_VERSION@_la_SOURCES = \
 	ws-versioningservice.hxx \
 	ws-versioningservice.cxx
 
-libcmis_@LIBCMIS_API_VERSION@_la_LDFLAGS = -export-dynamic -no-undefined -version-info 3:1:0
+libcmis_@LIBCMIS_API_VERSION@_la_LDFLAGS = -export-dynamic -no-undefined -version-info 3:2:0
 
 libcmis_@LIBCMIS_API_VERSION@_la_LIBADD = \
 	$(XML2_LIBS) \
--- src/libcmis/atom-folder.cxx
+++ src/libcmis/atom-folder.cxx
@@ -57,8 +57,11 @@ vector< libcmis::ObjectPtr > AtomFolder::getChildren( ) throw ( libcmis::Excepti
 {
     AtomLink* childrenLink = getLink( "down", "application/atom+xml;type=feed" );
 
+    // Some servers aren't giving the GetChildren properly... if not defined, we need to try
+    // as we may have the right to proceed.
     if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get() &&
-                !getAllowableActions()->isAllowed( libcmis::ObjectAction::GetChildren ) ) )
+                ( !getAllowableActions()->isAllowed( libcmis::ObjectAction::GetChildren ) &&
+                  getAllowableActions()->isDefined( libcmis::ObjectAction::GetChildren ) ) ) )
         throw libcmis::Exception( string( "GetChildren not allowed on node " ) + getId() );
 
     vector< libcmis::ObjectPtr > children;
@@ -182,7 +185,8 @@ libcmis::DocumentPtr AtomFolder::createDocument( const map< string, libcmis::Pro
     AtomLink* childrenLink = getLink( "down", "application/atom+xml;type=feed" );
 
     if ( ( NULL == childrenLink ) || ( getAllowableActions( ).get() &&
-                !getAllowableActions()->isAllowed( libcmis::ObjectAction::CreateDocument ) ) )
+                !getAllowableActions()->isAllowed( libcmis::ObjectAction::CreateDocument ) &&
+                getAllowableActions()->isDefined( libcmis::ObjectAction::CreateDocument ) ) )
         throw libcmis::Exception( string( "CreateDocument not allowed on folder " ) + getId() );
 
     xmlBufferPtr buf = xmlBufferCreate( );
@@ -210,9 +214,37 @@ libcmis::DocumentPtr AtomFolder::createDocument( const map< string, libcmis::Pro
     }
 
     string respBuf = response->getStream( )->str( );
-    xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(), getInfosUrl().c_str(), NULL, 0 );
+    xmlDocPtr doc = xmlReadMemory( respBuf.c_str(), respBuf.size(), getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
     if ( NULL == doc )
-        throw libcmis::Exception( "Failed to parse object infos" );
+    {
+        // We may not have the created document entry in the response body: this is
+        // the behaviour of some servers, but the standard says we need to look for
+        // the Location header.
+        map< string, string >& headers = response->getHeaders( );
+        map< string, string >::iterator it = headers.find( "Location" );
+
+        // Some servers like Lotus Live aren't sending Location header, but Content-Location
+        if ( it == headers.end( ) )
+            it = headers.find( "Content-Location" );
+
+        if ( it != headers.end() )
+        {
+            try
+            {
+                response = getSession( )->httpGetRequest( it->second );
+                respBuf = response->getStream( )->str( );
+                doc = xmlReadMemory( respBuf.c_str(), respBuf.size(), getInfosUrl().c_str(), NULL, XML_PARSE_NOERROR );
+            }
+            catch ( const CurlException& e )
+            {
+                throw e.getCmisException( );
+            }
+        }
+
+        // if doc is still NULL after that, then throw an exception
+        if ( NULL == doc )
+            throw libcmis::Exception( "Missing expected response from server" );
+    }
 
     libcmis::ObjectPtr created = getSession( )->createObjectFromEntryDoc( doc );
     xmlFreeDoc( doc );
--- src/libcmis/atom-object-type.cxx
+++ src/libcmis/atom-object-type.cxx
@@ -161,7 +161,7 @@ void AtomObjectType::refreshImpl( xmlDocPtr doc ) throw ( libcmis::Exception )
             {
                 string msg = "No such type: ";
                 msg += getId( );
-                throw libcmis::Exception( msg );
+                throw libcmis::Exception( msg, "objectNotFound" );
             }
             else
                 throw e.getCmisException( );
--- src/libcmis/atom-object.cxx
+++ src/libcmis/atom-object.cxx
@@ -140,6 +140,34 @@ libcmis::ObjectPtr AtomObject::updateProperties( const map< string, libcmis::Pro
     return updated;
 }
 
+libcmis::AllowableActionsPtr AtomObject::getAllowableActions( )
+{
+    if ( !m_allowableActions )
+    {
+        // For some reason we had no allowable actions before, get them now.
+        AtomLink* link = getLink( "http://docs.oasis-open.org/ns/cmis/link/200908/allowableactions", "application/cmisallowableactions+xml" );
+        if ( link )
+        {
+            try
+            {
+                libcmis::HttpResponsePtr response = getSession()->httpGetRequest( link->getHref() );
+                string buf = response->getStream()->str();
+                xmlDocPtr doc = xmlReadMemory( buf.c_str(), buf.size(), link->getHref().c_str(), NULL, 0 );
+                xmlNodePtr actionsNode = xmlDocGetRootElement( doc );
+                if ( actionsNode )
+                    m_allowableActions.reset( new libcmis::AllowableActions( actionsNode ) );
+
+                xmlFreeDoc( doc );
+            }
+            catch ( libcmis::Exception& )
+            {
+            }
+        }
+    }
+
+    return libcmis::Object::getAllowableActions();
+}
+
 void AtomObject::refreshImpl( xmlDocPtr doc ) throw ( libcmis::Exception )
 {
     bool createdDoc = ( NULL == doc );
--- src/libcmis/atom-object.hxx
+++ src/libcmis/atom-object.hxx
@@ -69,6 +69,8 @@ class AtomObject : public virtual libcmis::Object
         virtual libcmis::ObjectPtr updateProperties(
                     const std::map< std::string, libcmis::PropertyPtr >& properties ) throw ( libcmis::Exception );
 
+        virtual libcmis::AllowableActionsPtr getAllowableActions( );
+
         /** Reload the data from the server.
               */
         virtual void refresh( ) throw ( libcmis::Exception ) { refreshImpl( NULL ); }
--- src/libcmis/atom-session.cxx
+++ src/libcmis/atom-session.cxx
@@ -221,7 +221,7 @@ libcmis::ObjectPtr AtomPubSession::getObject( string id ) throw ( libcmis::Excep
         {
             string msg = "No such node: ";
             msg += id;
-            throw libcmis::Exception( msg );
+            throw libcmis::Exception( msg, "objectNotFound" );
         }
         else
             throw e.getCmisException();
@@ -251,7 +251,7 @@ libcmis::ObjectPtr AtomPubSession::getObjectByPath( string path ) throw ( libcmi
         {
             string msg = "No node corresponding to path: ";
             msg += path;
-            throw libcmis::Exception( msg );
+            throw libcmis::Exception( msg, "objectNotFound" );
         }
         else
             throw e.getCmisException();
--- src/libcmis/base-session.cxx
+++ src/libcmis/base-session.cxx
@@ -220,6 +220,7 @@ libcmis::HttpResponsePtr BaseSession::httpGetRequest( string url ) throw ( CurlE
 {
     // Reset the handle for the request
     curl_easy_reset( m_curlHandle );
+    initProtocols( );
 
     libcmis::HttpResponsePtr response( new libcmis::HttpResponse( ) );
 
@@ -252,6 +253,7 @@ libcmis::HttpResponsePtr BaseSession::httpPutRequest( string url, istream& is, v
 {
     // Reset the handle for the request
     curl_easy_reset( m_curlHandle );
+    initProtocols( );
 
     libcmis::HttpResponsePtr response( new libcmis::HttpResponse( ) );
 
@@ -317,6 +319,7 @@ libcmis::HttpResponsePtr BaseSession::httpPostRequest( string url, istringstream
 {
     // Reset the handle for the request
     curl_easy_reset( m_curlHandle );
+    initProtocols( );
 
     libcmis::HttpResponsePtr response( new libcmis::HttpResponse( ) );
 
@@ -382,6 +385,7 @@ void BaseSession::httpDeleteRequest( string url ) throw ( CurlException )
 {
     // Reset the handle for the request
     curl_easy_reset( m_curlHandle );
+    initProtocols( );
 
     curl_easy_setopt( m_curlHandle, CURLOPT_CUSTOMREQUEST, "DELETE" );
     httpRunRequest( url );
@@ -535,3 +539,10 @@ libcmis::Exception CurlException::getCmisException( ) const
 
     return libcmis::Exception( msg, type );
 }
+
+void BaseSession::initProtocols( )
+{
+    const unsigned long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+    curl_easy_setopt(m_curlHandle, CURLOPT_PROTOCOLS, protocols);
+    curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS, protocols);
+}
--- src/libcmis/base-session.hxx
+++ src/libcmis/base-session.hxx
@@ -149,6 +149,7 @@ class BaseSession : public libcmis::Session
         virtual void setAuthenticationProvider( libcmis::AuthProviderPtr provider ) { m_authProvider = provider; }
     private:
         void httpRunRequest( std::string url ) throw ( CurlException );
+        void initProtocols( );
 };
 
 #endif
--- src/libcmis/test-xmlutils.cxx
+++ src/libcmis/test-xmlutils.cxx
@@ -431,8 +431,16 @@ void XmlTest::propertyIntegerAsXmlTest( )
 
 void XmlTest::sha1Test( )
 {
-    string actual = libcmis::sha1( "Hello" );
-    CPPUNIT_ASSERT_EQUAL( string( "f7ff9e8b7bb2e09b70935a5d785e0cc5d9d0abf0" ), actual );
+    {
+        string actual = libcmis::sha1( "Hello" );
+        CPPUNIT_ASSERT_EQUAL( string( "f7ff9e8b7bb2e09b70935a5d785e0cc5d9d0abf0" ), actual );
+    }
+
+    {
+        // check correct width
+        string actual = libcmis::sha1( "35969137" );
+        CPPUNIT_ASSERT_EQUAL( string( "0d93546909cfeb5c00089202104df3980000ec9f" ), actual );
+    }
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION( XmlTest );
--- src/libcmis/xml-utils.cxx
+++ src/libcmis/xml-utils.cxx
@@ -498,8 +498,12 @@ namespace libcmis
         sha1.get_digest( digest );
 
         stringstream out;
+        // Setup writing mode. Every number must produce eight
+        // hexadecimal digits, including possible leading 0s, or we get
+        // less than 40 digits as result.
+        out << hex << setfill('0') << right;
         for ( int i = 0; i < 5; ++i )
-            out << hex << digest[i];
+            out << setw(8) << digest[i];
         return out.str();
     }

Places

File libcmis-0.3.1.patch of Package mingw32-cmis-client (Revision a8345835674afd7def04fc45f1be9422)

Places