Changeset 8619

Timestamp:

07/17/08 13:55:55

Author:

robert

Message:

Added osgDB::AuthenticationMap/Details? to osgDB and curl plugin to add the ability
to authenticate http transfers

Files:

• OpenSceneGraph/trunk/include/osgDB/ReaderWriter (modified) (4 diffs)
• OpenSceneGraph/trunk/include/osgDB/Registry (modified) (2 diffs)
• OpenSceneGraph/trunk/src/osgDB/ReaderWriter.cpp (modified) (1 diff)
• OpenSceneGraph/trunk/src/osgPlugins/curl/ReaderWriterCURL.cpp (modified) (3 diffs)
• OpenSceneGraph/trunk/src/osgPlugins/curl/ReaderWriterCURL.h (modified) (2 diffs)

OpenSceneGraph/trunk/include/osgDB/ReaderWriter

@@ -33 +33 @@
-typedef std::deque<std::string> FilePathList;
-
+class AuthenticationDetails : public osg::Referenced
+{
+public:
+
+    /** Http authentication techniques, see libcurl docs for details on names and associated functionality.*/ 
+    enum HttpAuthentication
+    {
+        BASIC           = 1<<0,
+        DIGEST          = 1<<1,
+        NTLM            = 1<<2,
+        GSSNegotiate    = 1<<2,
+        ANY             = ~0,
+        ANYSAFE         = ~BASIC
+    };
+
+    AuthenticationDetails(const std::string& u, const std::string& p, HttpAuthentication auth=BASIC):
+        username(u),
+        password(p),
+        httpAuthentication(auth) {}
+
+    std::string         username;
+    std::string         password;
+    HttpAuthentication  httpAuthentication;
+
+protected:
+    virtual ~AuthenticationDetails() {}
+};
+
+class OSGDB_EXPORT AuthenticationMap : public osg::Referenced
+{
+    public:
+    
+        AuthenticationMap() {}
+        
+
+        virtual void addAuthenticationDetails(const std::string& path, AuthenticationDetails* details);
+
+        virtual const AuthenticationDetails* getAuthenticationDetails(const std::string& path) const;
+        
+    protected:
+    
+        virtual ~AuthenticationMap() {}
+        
+        typedef std::map<std::string, osg::ref_ptr<AuthenticationDetails> > AuthenticationDetailsMap;
+        AuthenticationDetailsMap _authenticationMap;
+        
+};
+
-/** pure virtual base class for reading and writing of non native formats. */
-class OSGDB_EXPORT ReaderWriter : public osg::Object
@@ -160 +208 @@
-
-
+                /** Set the password map to be used by plugins when access files from secure locations.*/
+                void setAuthenticationMap(AuthenticationMap* authenticationMap) { _authenticationMap = authenticationMap; }
+
+                /** Get the password map to be used by plugins when access files from secure locations.*/
+                const AuthenticationMap* getAuthenticationMap() const { return _authenticationMap.get(); }
+
-
-                /** Sets a plugindata value PluginData with a string */
@@ -181 +235 @@
-                virtual ~Options() {}
-
-
-
-
-
+
+
+
+
+
-
-                typedef std::map<std::string,void*> PluginDataMap;
@@ -248 +303 @@
-                std::string                 _message;
-                osg::ref_ptr<osg::Object>   _object;
+
-        };
-

OpenSceneGraph/trunk/include/osgDB/Registry

@@ -335 +335 @@
-
-
+        /** Set whether the KdTrees should be built for geometry in the loader model. */
-        void setBuildKdTreesHint(ReaderWriter::Options::BuildKdTreesHint hint) { _buildKdTreesHint = hint; }
+
+        /** Get whether the KdTrees should be built for geometry in the loader model. */
-        ReaderWriter::Options::BuildKdTreesHint getBuildKdTreesHint() const { return _buildKdTreesHint; }
-
+        /** Set the KdTreeBuilder visitor that is used to build KdTree on loaded models.*/
-        void setKdTreeBuilder(osg::KdTreeBuilder* builder) { _kdTreeBuilder = builder; }
+
+        /** Get the KdTreeBuilder visitor that is used to build KdTree on loaded models.*/
-        osg::KdTreeBuilder* getKdTreeBuilder() { return _kdTreeBuilder.get(); }
+
+
+        /** Set the password map to be used by plugins when access files from secure locations.*/
+        void setAuthenticationMap(AuthenticationMap* authenticationMap) { _authenticationMap = authenticationMap; }
+
+        /** Get the password map to be used by plugins when access files from secure locations.*/
+        const AuthenticationMap* getAuthenticationMap() const { return _authenticationMap.get(); }
-
-
-        void setCreateNodeFromImage(bool flag) { _createNodeFromImage = flag; }
-        bool getCreateNodeFromImage() const { return _createNodeFromImage; }
-
+
-
-        void setOptions(ReaderWriter::Options* opt) { _options = opt; }
@@ -478 +491 @@
-        ReaderWriter::Options::BuildKdTreesHint     _buildKdTreesHint;
-        osg::ref_ptr<osg::KdTreeBuilder>            _kdTreeBuilder;
+        
+        osg::ref_ptr<AuthenticationMap>             _authenticationMap;
-        
-        bool                                        _createNodeFromImage;

OpenSceneGraph/trunk/src/osgDB/ReaderWriter.cpp

@@ -16 +16 @@
-#include <osgDB/Archive>
-
+#include <map>
+
-using namespace osgDB;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  PasswordMap
+//
+
+void AuthenticationMap::addAuthenticationDetails(const std::string& path, AuthenticationDetails* details)
+{
+   _authenticationMap[path] = details;
+}
+
+const AuthenticationDetails* AuthenticationMap::getAuthenticationDetails(const std::string& path) const
+{
+    // see if the full filename has its own authentication details
+    AuthenticationDetailsMap::const_iterator itr = _authenticationMap.find(path);
+    if (itr != _authenticationMap.end()) return itr->second.get();
+
+    // now look to see if the paths to the file have their own authentication details
+    std::string basePath = osgDB::getFilePath(path);
+    while(!basePath.empty())
+    {
+        itr = _authenticationMap.find(basePath);
+        if (itr != _authenticationMap.end()) return itr->second.get();
+        
+        basePath = osgDB::getFilePath(basePath);
+    }
+    return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+//  ReaderWriter
+//
-
-osg::Object* ReaderWriter::ReadResult::getObject() { return _object.get(); }

OpenSceneGraph/trunk/src/osgPlugins/curl/ReaderWriterCURL.cpp

@@ -76 +76 @@
-{
-    osg::notify(osg::INFO)<<"EasyCurl::EasyCurl()"<<std::endl;
+    
+    _previousHttpAuthentication = 0;
-
-    _curl = curl_easy_init();
@@ -93 +95 @@
-
-
-
-
+
+
+
+
+
+
-    if(!proxyAddress.empty())
-    {
-NOTICE
+INFO
-        curl_easy_setopt(_curl, CURLOPT_PROXY, proxyAddress.c_str()); //Sets proxy address and port on libcurl
+    }
+
+    const osgDB::AuthenticationDetails* details = authenticationMap ?
+        authenticationMap->getAuthenticationDetails(fileName) :
+        0;
+
+    // configure/reset authentication if required.        
+    if (details)
+    {
+        const std::string colon(":");
+        std::string password(details->username + colon + details->password);
+        curl_easy_setopt(_curl, CURLOPT_USERPWD, password.c_str());
+        _previousPassword = password;
+
+        // use for https.
+        // curl_easy_setopt(_curl, CURLOPT_KEYPASSWD, password.c_str());
+
+        if (details->httpAuthentication != _previousHttpAuthentication)
+        { 
+            curl_easy_setopt(_curl, CURLOPT_HTTPAUTH, details->httpAuthentication); 
+            _previousHttpAuthentication = details->httpAuthentication;
+        }
+    }
+    else
+    {
+        if (!_previousPassword.empty())
+        {
+            curl_easy_setopt(_curl, CURLOPT_USERPWD, 0);
+            _previousPassword.clear();
+        }
+    
+        // need to reset if previously set.
+        if (_previousHttpAuthentication!=0)
+        {
+            curl_easy_setopt(_curl, CURLOPT_HTTPAUTH, 0); 
+            _previousHttpAuthentication = 0;
+        }
-    }
-
@@ -249 +292 @@
-    EasyCurl::StreamObject sp(&buffer, std::string());
-
-
+, options
-
-    if (curlResult.status()==ReadResult::FILE_LOADED)
-    {
-
-
+
+
+
-
-        local_opt->getDatabasePathList().push_front(osgDB::getFilePath(fileName));

OpenSceneGraph/trunk/src/osgPlugins/curl/ReaderWriterCURL.h

@@ -51 +51 @@
-        EasyCurl();
-
-
+, const osgDB::ReaderWriter::Options *options
-
-    protected:
@@ -63 +63 @@
-        
-        CURL* _curl;
+        
+        std::string     _previousPassword;
+        long            _previousHttpAuthentication;
-};
-