Update README.md

Makefile

@@ -1,13 +1,10 @@
-LIBDIR ?= /usr/lib
-INCDIR ?= /usr/include
+PREFIX ?= /usr/local
+LIBDIR ?= /lib
+INCDIR ?= /include
 
 AR ?= $(CROSS)ar
 CXX ?= $(CROSS)g++
 
-ifeq ($(PREFIX),)
-    PREFIX := /usr/local
-endif
-
 UPDFPARSERLIB = ./lib/updfparser/libupdfparser.a
 
 CXXFLAGS += -Wall -fPIC -I./include -I./usr/include/pugixml -I./lib/updfparser/include
@@ -86,13 +83,13 @@ libgourou.so: libgourou.so.$(VERSION)
 	ln -f -s $^ $@
 
 build_utils: $(TARGET_LIBRARIES)
-	$(MAKE) -C utils ROOT=$(PWD) CXX=$(CXX) AR=$(AR) DEBUG=$(DEBUG) STATIC_UTILS=$(STATIC_UTILS) DEST_DIR=$(DEST_DIR) PREFIX=$(PREFIX)
+	$(MAKE) -C utils ROOT=$(PWD) CXX=$(CXX) AR=$(AR) DEBUG=$(DEBUG) STATIC_UTILS=$(STATIC_UTILS) DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 
 install: $(TARGET_LIBRARIES)
 	install -d $(DESTDIR)$(PREFIX)$(LIBDIR)
 # Use cp to preserver symlinks
 	cp --no-dereference $(TARGET_LIBRARIES) $(DESTDIR)$(PREFIX)$(LIBDIR)
-	$(MAKE) -C utils ROOT=$(PWD) CXX=$(CXX) AR=$(AR) DEBUG=$(DEBUG) STATIC_UTILS=$(STATIC_UTILS) DEST_DIR=$(DEST_DIR) PREFIX=$(PREFIX) install
+	$(MAKE) -C utils ROOT=$(PWD) CXX=$(CXX) AR=$(AR) DEBUG=$(DEBUG) STATIC_UTILS=$(STATIC_UTILS) DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) install
 
 uninstall:
 	cd $(DESTDIR)$(PREFIX)/$(LIBDIR)

README.md

@@ -8,7 +8,7 @@ Architecture
 ------------
 
 Like RMSDK, libgourou has a client/server scheme. All platform specific functions (crypto, network...) has to be implemented in a client class (that derives from DRMProcessorClient) while server implements ADEPT protocol.
-A reference implementation using Qt, OpenSSL and libzip is provided (in _utils_ directory).
+A reference implementation using cURL, OpenSSL and libzip is provided (in _utils_ directory).
 
 Main fucntions to use from gourou::DRMProcessor are :
 
@@ -76,6 +76,8 @@ BUILD_STATIC build libgourou.a if 1, nothing if 0, can be combined with BUILD_SH
 
 BUILD_SHARED build libgourou.so if 1, nothing if 0, can be combined with BUILD_STATIC
 
+other variables are DESTDIR and PREFIX to handle destination install directory
+
 * Default value
 
 
@@ -147,3 +149,4 @@ Special thanks
 
   * _Jens_ for all test samples and utils testing
   * _Milian_ for debug & code
+  * _Berwyn H_ for all test samples, feedbacks, patches and kind donation

include/Base64.h

@@ -26,6 +26,7 @@
  */
 
 #include <string>
+#include <stdint.h>
 
 namespace macaron {
 

include/libgourou.h

@@ -27,6 +27,7 @@
 #include "drmprocessorclient.h"
 
 #include <pugixml.hpp>
+#include <stdint.h>
 
 #ifndef HOBBES_DEFAULT_VERSION
 #define HOBBES_DEFAULT_VERSION  "10.0.4"
@@ -36,7 +37,7 @@
 #define ACS_SERVER              "http://adeactivate.adobe.com/adept"
 #endif
 
-#define LIBGOUROU_VERSION       "0.8.1"
+#define LIBGOUROU_VERSION       "0.8.3"
 
 namespace gourou
 {
@@ -66,10 +67,11 @@ namespace gourou
 	 * @brief Fulfill ACSM file to server in order to retrieve ePub fulfillment item
 	 *
 	 * @param ACSMFile       Path of ACSMFile
+	 * @param notify         Notify server if requested by response
 	 *
 	 * @return a FulfillmentItem if all is OK
 	 */
-	FulfillmentItem* fulfill(const std::string& ACSMFile);
+	FulfillmentItem* fulfill(const std::string& ACSMFile, bool notify=true);
 
 	/**
 	 * @brief Once fulfilled, ePub file needs to be downloaded.
@@ -101,8 +103,9 @@ namespace gourou
 	 *
 	 * @param loanID          Loan ID received during fulfill
 	 * @param operatorURL     URL of operator that loans this book
+	 * @param notify          Notify server if requested by response
 	 */
-	void returnLoan(const std::string& loanID, const std::string& operatorURL);
+	void returnLoan(const std::string& loanID, const std::string& operatorURL, bool notify=true);
 
 	/**
 	 * @brief Return default ADEPT directory (ie /home/<user>/.config/adept)
@@ -155,7 +158,7 @@ namespace gourou
 	 * @brief Send HTTP POST request to URL with document as POSTData
 	 */
 	ByteArray sendRequest(const pugi::xml_document& document, const std::string& url);
-
+	
 	/**
 	 * @brief In place encrypt data with private device key
 	 */
@@ -232,6 +235,9 @@ namespace gourou
 	void buildSignInRequest(pugi::xml_document& signInRequest, const std::string& adobeID, const std::string& adobePassword, const std::string& authenticationCertificate);
 	void fetchLicenseServiceCertificate(const std::string& licenseURL,
 					    const std::string& operatorURL);
+	void buildNotifyReq(pugi::xml_document& returnReq, pugi::xml_node& body);	
+	void notifyServer(pugi::xml_node& notifyRoot);
+	void notifyServer(pugi::xml_document& fulfillReply);
 	std::string encryptedKeyFirstPass(pugi::xml_document& rightsDoc, const std::string& encryptedKey, const std::string& keyType);
 	void decryptADEPTKey(pugi::xml_document& rightsDoc, unsigned char* decryptedKey, const unsigned char* encryptionKey=0, unsigned encryptionKeySize=0);
 	void removeEPubDRM(const std::string& filenameIn, const std::string& filenameOut, const unsigned char* encryptionKey, unsigned encryptionKeySize);

include/libgourou_common.h

@@ -235,12 +235,7 @@ namespace gourou
 	return ltrim(rtrim(s, t), t);
     }
 
-    /**
-     * @brief Extract text node from tag in document
-     * It can throw an exception if tag does not exists
-     * or just return an empty value
-     */
-    static inline std::string extractTextElem(const pugi::xml_node& root, const char* tagName, bool throwOnNull=true)
+    static inline pugi::xml_node getNode(const pugi::xml_node& root, const char* tagName, bool throwOnNull=true)
     {
         pugi::xpath_node xpath_node = root.select_node(tagName);
 
@@ -249,10 +244,23 @@ namespace gourou
 	    if (throwOnNull)
 		EXCEPTION(GOUROU_TAG_NOT_FOUND, "Tag " << tagName << " not found");
 	    
-            return "";
+            return pugi::xml_node();
 	}
 
-	pugi::xml_node node = xpath_node.node().first_child();
+	return xpath_node.node();
+
+    }
+    
+    /**
+     * @brief Extract text node from tag in document
+     * It can throw an exception if tag does not exists
+     * or just return an empty value
+     */
+    static inline std::string extractTextElem(const pugi::xml_node& root, const char* tagName, bool throwOnNull=true)
+    {
+	pugi::xml_node node = getNode(root, tagName, throwOnNull);
+
+	node = node.first_child();
 
 	if (!node)
 	{
@@ -266,6 +274,30 @@ namespace gourou
         return trim(res);
     }
 
+    /**
+     * @brief Set text node of a tag in document
+     * It can throw an exception if tag does not exists
+     */
+    static inline void setTextElem(const pugi::xml_node& root, const char* tagName,
+				   const std::string& value, bool throwOnNull=true)
+    {
+	pugi::xml_node node = getNode(root, tagName, throwOnNull);
+
+	if (!node)
+	{
+	    if (throwOnNull)
+		EXCEPTION(GOUROU_TAG_NOT_FOUND, "Text element for tag " << tagName << " not found");
+            return;
+	}
+
+	node = node.first_child();
+
+	if (!node)
+	    node.append_child(pugi::node_pcdata).set_value(value.c_str());
+	else
+	    node.set_value(value.c_str());
+    }
+
     /**
      * @brief Extract text attribute from tag in document
      * It can throw an exception if attribute does not exists
@@ -273,17 +305,9 @@ namespace gourou
      */
     static inline std::string extractTextAttribute(const pugi::xml_node& root, const char* tagName, const char* attributeName, bool throwOnNull=true)
     {
-        pugi::xpath_node xpath_node = root.select_node(tagName);
+	pugi::xml_node node = getNode(root, tagName, throwOnNull);
 
-        if (!xpath_node)
-	{
-	    if (throwOnNull)
-		EXCEPTION(GOUROU_TAG_NOT_FOUND, "Tag " << tagName << " not found");
-	    
-            return "";
-	}
-
-	pugi::xml_attribute attr = xpath_node.node().attribute(attributeName);
+	pugi::xml_attribute attr = node.attribute(attributeName);
 
 	if (!attr)
 	{

src/libgourou.cpp

@@ -495,7 +495,7 @@ namespace gourou
 	user->updateActivationFile(activationDoc);
     }
     
-    FulfillmentItem* DRMProcessor::fulfill(const std::string& ACSMFile)
+    FulfillmentItem* DRMProcessor::fulfill(const std::string& ACSMFile, bool notify)
     {
 	if (!user->getPKCS12().length())
 	    EXCEPTION(FF_NOT_ACTIVATED, "Device not activated");
@@ -580,7 +580,12 @@ namespace gourou
 	
 	fetchLicenseServiceCertificate(licenseURL, operatorURL);
 
-	return new FulfillmentItem(fulfillReply, user);
+	FulfillmentItem* item = new FulfillmentItem(fulfillReply, user);
+
+	if (notify)
+	    notifyServer(fulfillReply);
+	    
+	return item;
     }
 
     DRMProcessor::ITEM_TYPE DRMProcessor::download(FulfillmentItem* item, std::string path, bool resume)
@@ -873,7 +878,8 @@ namespace gourou
 #endif
     }
 
-    void DRMProcessor::returnLoan(const std::string& loanID, const std::string& operatorURL)
+    void DRMProcessor::returnLoan(const std::string& loanID, const std::string& operatorURL,
+				  bool notify)
     {
 	pugi::xml_document returnReq;
 
@@ -881,9 +887,73 @@ namespace gourou
 
 	buildReturnReq(returnReq, loanID, operatorURL);
 
-	sendRequest(returnReq, operatorURL + "/LoanReturn");
+	ByteArray replyData = sendRequest(returnReq, operatorURL + "/LoanReturn");
+	
+	pugi::xml_document fulfillReply;
+
+	fulfillReply.load_string((const char*)replyData.data());
+
+	if (notify)
+	    notifyServer(fulfillReply);
     }
 
+    void DRMProcessor::buildNotifyReq(pugi::xml_document& returnReq, pugi::xml_node& body)
+    {
+	pugi::xml_node decl = returnReq.append_child(pugi::node_declaration);
+	decl.append_attribute("version") = "1.0";
+	
+	pugi::xml_node root = returnReq.append_child("adept:notification");
+	root.append_attribute("xmlns:adept") = ADOBE_ADEPT_NS;
+
+	appendTextElem(root, "adept:user",      user->getUUID());
+	appendTextElem(root, "adept:device",    user->getDeviceUUID());
+	body = root.append_copy(body);
+	body.append_attribute("xmlns") = ADOBE_ADEPT_NS;
+	
+	addNonce(root);
+	signNode(root);
+    }
+
+    void DRMProcessor::notifyServer(pugi::xml_node& notifyRoot)
+    {
+	std::string notifyUrl = extractTextElem(notifyRoot, "//notifyURL", false);
+	pugi::xml_node notifyBody = getNode(notifyRoot, "//body", false);
+	
+	if (notifyUrl == "")
+	{
+	    GOUROU_LOG(INFO, "No notify URL");
+	    return;
+	}
+
+	if (!notifyBody)
+	{
+	    GOUROU_LOG(INFO, "No notify body");
+	    return;
+	}
+
+	pugi::xml_document notifyReq;
+	buildNotifyReq(notifyReq, notifyBody);
+
+	sendRequest(notifyReq, notifyUrl);
+    }
+    
+    void DRMProcessor::notifyServer(pugi::xml_document& fulfillReply)
+    {
+	pugi::xpath_node_set notifySet = fulfillReply.select_nodes("//notify");
+
+	if (notifySet.empty())
+	{
+	    GOUROU_LOG(DEBUG, "No notify request");
+	    return;
+	}
+
+	for (pugi::xpath_node_set::const_iterator it = notifySet.begin(); it != notifySet.end(); ++it)
+	{
+	    pugi::xml_node notifyRoot = it->node();
+	    notifyServer(notifyRoot);
+	}
+    }
+    
     ByteArray DRMProcessor::encryptWithDeviceKey(const unsigned char* data, unsigned int len)
     {
 	const unsigned char* deviceKey = device->getDeviceKey();
@@ -1363,6 +1433,30 @@ namespace gourou
 
 		    delete[] clearData;
 		}
+		else if (dictData->type() == uPDFParser::DataType::HEXASTRING)
+		{
+		    string = ((uPDFParser::HexaString*) dictData)->value();
+		    ByteArray hexStr = ByteArray::fromHex(string);
+		    
+		    unsigned char* encryptedData = hexStr.data();
+		    unsigned int dataLength = hexStr.size();
+		    unsigned char* clearData = new unsigned char[dataLength];
+		    unsigned int dataOutLength;
+
+		    GOUROU_LOG(DEBUG, "Decrypt hexa string " << dictIt->first << " " << dataLength);
+
+		    client->decrypt(CryptoInterface::ALGO_RC4, CryptoInterface::CHAIN_ECB,
+				    tmpKey, sizeof(tmpKey), /* Key */
+				    NULL, 0, /* IV */
+				    encryptedData, dataLength,
+				    clearData, &dataOutLength);
+
+		    ByteArray clearHexStr = ByteArray(clearData, dataOutLength);
+		    decodedStrings[dictIt->first] = new uPDFParser::HexaString(
+			clearHexStr.toHex());
+
+		    delete[] clearData;
+		}
 	    }
 		
 	    for (dictIt = decodedStrings.begin(); dictIt != decodedStrings.end(); dictIt++)

src/loan_token.cpp

@@ -29,24 +29,13 @@ namespace gourou
 	if (!node)
 	    EXCEPTION(FFI_INVALID_LOAN_TOKEN, "No loanToken element in document");
 
-	node = doc.select_node("/envelope/loanToken/loan").node();
+	node = doc.select_node("/envelope/fulfillmentResult/fulfillment").node();
 
 	if (node)
 	    properties["id"] = node.first_child().value();
 	else
 	{
-	    node = doc.select_node("/envelope/fulfillmentResult/resourceItemInfo/licenseToken/permissions/display/loan").node();
-
-	    if (node)
-		properties["id"] = node.first_child().value();
-	    else
-	    {
-		node = doc.select_node("/envelope/fulfillmentResult/resourceItemInfo/licenseToken/permissions/play/loan").node();
-		if (node)
-		    properties["id"] = node.first_child().value();
-		else
-		    EXCEPTION(FFI_INVALID_LOAN_TOKEN, "No loanToken/loan element in document");
-	    }
+	    EXCEPTION(FFI_INVALID_LOAN_TOKEN, "No fulfillment element in document");
 	}
 
 	node = doc.select_node("/envelope/loanToken/operatorURL").node();

utils/Makefile

@@ -1,5 +1,5 @@
-BINDIR ?= /usr/bin
-MANDIR ?= /usr/share/man
+BINDIR ?= /bin
+MANDIR ?= /share/man
 
 TARGET_BINARIES=acsmdownloader adept_activate adept_remove adept_loan_mgt
 TARGETS=$(TARGET_BINARIES) launcher

utils/acsmdownloader.cpp

@@ -46,6 +46,7 @@ static       bool  exportPrivateKey = false;
 static const char* outputFile     = 0;
 static const char* outputDir      = 0;
 static       bool  resume         = false;
+static       bool  notify         = true;
 
 
 class ACSMDownloader
@@ -82,7 +83,7 @@ public:
 	    }
 	    else
 	    {
-		gourou::FulfillmentItem* item = processor.fulfill(acsmFile);
+		gourou::FulfillmentItem* item = processor.fulfill(acsmFile, notify);
 
 		std::string filename;
 		if (!outputFile)
@@ -190,6 +191,7 @@ static void usage(const char* cmd)
     std::cout << "  " << "-f|--acsm-file"       << "\t"   << "Backward compatibility: ACSM request file for epub download" << std::endl;
     std::cout << "  " << "-e|--export-private-key"<< "\t" << "Export private key in DER format" << std::endl;
     std::cout << "  " << "-r|--resume"          << "\t\t" << "Try to resume download (in case of previous failure)" << std::endl;
+    std::cout << "  " << "-N|--no-notify"       << "\t\t" << "Don't notify server, even if requested" << std::endl;
     std::cout << "  " << "-v|--verbose"         << "\t\t" << "Increase verbosity, can be set multiple times" << std::endl;
     std::cout << "  " << "-V|--version"         << "\t\t" << "Display libgourou version" << std::endl;
     std::cout << "  " << "-h|--help"            << "\t\t" << "This help" << std::endl;
@@ -232,13 +234,14 @@ int main(int argc, char** argv)
 	    {"acsm-file",        required_argument, 0,  'f' },
 	    {"export-private-key",no_argument,      0,  'e' },
 	    {"resume",           no_argument,       0,  'r' },
+	    {"no-notify",        no_argument,       0,  'N' },
 	    {"verbose",          no_argument,       0,  'v' },
 	    {"version",          no_argument,       0,  'V' },
 	    {"help",             no_argument,       0,  'h' },
 	    {0,                  0,                 0,  0 }
 	};
 
-	c = getopt_long(argc, argv, "D:d:a:k:O:o:f:ervVh",
+	c = getopt_long(argc, argv, "D:d:a:k:O:o:f:erNvVh",
                         long_options, &option_index);
 	if (c == -1)
 	    break;
@@ -276,6 +279,9 @@ int main(int argc, char** argv)
 	case 'r':
 	    resume = true;
 	    break;
+	case 'N':
+	    notify = false;
+	    break;
 	case 'v':
 	    verbose++;
 	    break;

utils/adept_activate.cpp

@@ -31,6 +31,7 @@
 #include <termios.h>
 #include <string.h>
 #include <limits.h>
+#include <libgen.h>
 
 #include <iostream>
 #include <ostream>

utils/adept_loan_mgt.cpp

@@ -52,6 +52,7 @@ static const char* devicekeyFile  = "devicesalt";
 static       bool  list           = false;
 static const char* returnID       = 0;
 static const char* deleteID       = 0;
+static       bool  notify         = true;
 
 struct Loan
 {
@@ -296,7 +297,7 @@ private:
 	    return;
 	}
 
-	processor.returnLoan(loan->id, loan->operatorURL);
+	processor.returnLoan(loan->id, loan->operatorURL, notify);
 	
 	deleteID = returnID;
 	if (deleteLoan(false))
@@ -342,6 +343,7 @@ static void usage(const char* cmd)
     std::cout << "  " << "-l|--list"            << "\t\t" << "List all loaned books" << std::endl;
     std::cout << "  " << "-r|--return"          << "\t\t" << "Return a loaned book" << std::endl;
     std::cout << "  " << "-d|--delete"          << "\t\t" << "Delete a loan entry without returning it" << std::endl;
+    std::cout << "  " << "-N|--no-notify"       << "\t\t" << "Don't notify server, even if requested" << std::endl;
     std::cout << "  " << "-v|--verbose"         << "\t\t" << "Increase verbosity, can be set multiple times" << std::endl;
     std::cout << "  " << "-V|--version"         << "\t\t" << "Display libgourou version" << std::endl;
     std::cout << "  " << "-h|--help"            << "\t\t" << "This help" << std::endl;
@@ -375,6 +377,7 @@ int main(int argc, char** argv)
 	    {"list",             no_argument,       0,  'l' },
 	    {"return",           no_argument,       0,  'r' },
 	    {"delete",           no_argument,       0,  'd' },
+	    {"no-notify",        no_argument,       0,  'N' },
 	    {"verbose",          no_argument,       0,  'v' },
 	    {"version",          no_argument,       0,  'V' },
 	    {"help",             no_argument,       0,  'h' },
@@ -402,6 +405,9 @@ int main(int argc, char** argv)
 	    deleteID = optarg;
 	    actions++;
 	    break;
+	case 'N':
+	    notify = false;
+	    break;
 	case 'v':
 	    verbose++;
 	    break;

utils/adept_remove.cpp

@@ -27,6 +27,7 @@
 */
 
 #include <getopt.h>
+#include <libgen.h>
 
 #include <iostream>