Merge pull request #19411 from timothyklemm/hpcc-33032-secmgr-cleanup

HPCC-33032: Complete removal of obsolete security managers Reviewed-By: Ken Rowland <kenneth.rowland@lexisnexisrisk.com> Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
hpcc-systems · Jan 20, 2025 · 4ad1c48 · 4ad1c48
2 parents 6725944 + f661e59
commit 4ad1c48
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 140 deletions.
diff --git a/esp/bindings/http/platform/httpbinding.cpp b/esp/bindings/http/platform/httpbinding.cpp
@@ -446,11 +446,8 @@ EspHttpBinding::EspHttpBinding(IPropertyTree* tree, const char *bindname, const
                         m_feature_authmap.setown(m_secmgr->createFeatureMap(authcfg));
                         m_setting_authmap.setown(m_secmgr->createSettingMap(authcfg));
                     }
-                    else if(stricmp(m_authmethod.str(), "Local") == 0)
-                    {
-                        m_secmgr.setown(SecLoader::loadSecManager("Local", "EspHttpBinding", NULL));
-                        m_authmap.setown(m_secmgr->createAuthMap(authcfg));
-                    }
+                    else if(strieq(m_authmethod.str(), "Local") || strieq(m_authmethod.str(), "Default"))
+                        throw makeStringExceptionV(-1, "obsolete auth method %s; update configuration", m_authmethod.str());
                     IRestartManager* restartManager = dynamic_cast<IRestartManager*>(m_secmgr.get());
                     if(restartManager!=NULL)
                     {

diff --git a/esp/platform/application_config.cpp b/esp/platform/application_config.cpp
@@ -156,6 +156,8 @@ bool addAuthNZSecurity(const char *name, IPropertyTree *legacyEsp, IPropertyTree
         appSecMgr = authNZ;
     }
     const char *method = appSecMgr->queryProp("@name");
+    if (isEmptyString(method))
+        throw MakeStringException(-1, "SecurityManager name attribute required.  To run without security set 'auth: none'");
     const char *tag = appSecMgr->queryProp("@type");
     if (isEmptyString(tag))
         throw MakeStringException(-1, "SecurityManager type attribute required.  To run without security set 'auth: none'");
@@ -167,7 +169,7 @@ bool addAuthNZSecurity(const char *name, IPropertyTree *legacyEsp, IPropertyTree
     mergePTree(legacy, authNZ); //extra info clean up later
     legacy->removeProp("SecurityManager"); //already copied these attributes above, don't need this as a child
 
-    bindAuth.setf("<Authenticate method='%s'/>", method ? method : "unknown");
+    bindAuth.setf("<Authenticate method='%s'/>", method);
     return true;
 }
 

diff --git a/system/jlib/jutil.cpp b/system/jlib/jutil.cpp
@@ -2062,130 +2062,6 @@ bool deduceMask(const char *fn, bool expandN, StringAttr &mask, unsigned &pret,
 }
 
 //==============================================================
-#ifdef _WIN32
-
-
-class CWindowsAuthenticatedUser: implements IAuthenticatedUser, public CInterface
-{
-    StringAttr name;
-    HANDLE usertoken;
-public:
-    IMPLEMENT_IINTERFACE;
-    CWindowsAuthenticatedUser()
-    {
-        usertoken = (HANDLE)-1;
-    }
-    ~CWindowsAuthenticatedUser()
-    {
-        if (usertoken != (HANDLE)-1)
-            CloseHandle(usertoken);
-    }
-    bool login(const char *user, const char *passwd)
-    {
-        name.clear();
-        if (usertoken != (HANDLE)-1)
-            CloseHandle(usertoken);
-        StringBuffer domain("");
-        const char *ut = strchr(user,'\\');
-        if (ut) {
-            domain.clear().append((size32_t)(ut-user),user);
-            user = ut+1;
-        }
-        BOOL res = LogonUser((LPTSTR)user,(LPTSTR)(domain.length()==0?NULL:domain.str()),(LPTSTR)passwd,LOGON32_LOGON_NETWORK,LOGON32_PROVIDER_DEFAULT,&usertoken);
-        if (res==0)
-            return false;
-        name.set(user);
-        return true;
-    }
-    void impersonate()
-    {
-        if (!ImpersonateLoggedOnUser(usertoken))
-            throw makeOsException(GetLastError());
-    }
-
-    void revert()
-    {
-        RevertToSelf();
-    }
-
-    const char *username()
-    {
-        return name.get();
-    }
-};
-
-IAuthenticatedUser *createAuthenticatedUser() { return new CWindowsAuthenticatedUser; }
-
-#elif defined(__linux__)
-
-class CLinuxAuthenticatedUser: implements IAuthenticatedUser, public CInterface
-{
-    StringAttr name;
-    uid_t uid;
-    gid_t gid;
-    uid_t saveuid;
-    gid_t savegid;
-
-public:
-    IMPLEMENT_IINTERFACE;
-    bool login(const char *user, const char *passwd)
-    {
-        name.clear();
-        const char *ut = strchr(user,'\\');
-        if (ut)
-            user = ut+1; // remove windows domain
-        struct passwd *pw;
-        char *epasswd;
-        if ((pw = getpwnam(user)) == NULL)
-            return false;
-        struct spwd *spwd = getspnam(user);
-        if (spwd)
-            epasswd = spwd->sp_pwdp;
-        else
-            epasswd = pw->pw_passwd;
-        if (!epasswd||!*epasswd)
-            return false;
-        if (strcmp(crypt(passwd,epasswd),epasswd)!=0)
-            return false;
-        uid = pw->pw_uid;
-        gid = pw->pw_gid;
-        name.set(pw->pw_name);
-        return true;
-    }
-    void impersonate()
-    {
-        saveuid = geteuid();
-        savegid = getegid();
-        if (setegid(gid) == -1)
-            throw makeOsException(errno, "Failed to set effective group id");
-        if (seteuid(uid) == -1)
-            throw makeOsException(errno, "Failed to set effective user id");
-    }
-
-    void revert()
-    {
-        if (seteuid(saveuid) == -1)
-            throw makeOsException(errno, "Failed to restore effective group id");
-        if (setegid(savegid) == -1)
-            throw makeOsException(errno, "Failed to restore effective user id");
-    }
-
-    const char *username()
-    {
-        return name.get();
-    }
-
-};
-
-
-
-IAuthenticatedUser *createAuthenticatedUser() { return new CLinuxAuthenticatedUser; }
-#elif defined(__FreeBSD__) || defined (__APPLE__)
-
-IAuthenticatedUser *createAuthenticatedUser() { UNIMPLEMENTED; }
-
-#endif
-
 
 extern jlib_decl void serializeAtom(MemoryBuffer & target, IAtom * name)
 {

diff --git a/system/jlib/jutil.hpp b/system/jlib/jutil.hpp
@@ -373,17 +373,7 @@ class jlib_decl NamedCount
 
 extern jlib_decl StringBuffer &dumpNamedCounts(StringBuffer &str);
 
-
-interface IAuthenticatedUser: extends IInterface
-{
-    virtual bool login(const char *user, const char *passwd) = 0;
-    virtual void impersonate()=0;
-    virtual void revert()=0;
-    virtual const char *username()=0;
-};
-
 interface IAtom;
-extern jlib_decl IAuthenticatedUser *createAuthenticatedUser();
 extern jlib_decl void serializeAtom(MemoryBuffer & target, IAtom * name);
 extern jlib_decl IAtom * deserializeAtom(MemoryBuffer & source);