Deprecate auth package and TNetFile

README/README.AUTH

@@ -1,3 +1,7 @@
+# NOTE: The auth package is depcreated and will be remove in v6.42.
+ROOT will not provide socket authentication anymore but assumes that TSocket connections are between trusted processes.
+Consider using SSH tunneling if you need secure network connections.
+
 Authentication to ROOT servers (TServerSocket)
 ==============================================
 

core/base/inc/LinkDef3.h

@@ -163,7 +163,7 @@
 #pragma link C++ class TFileInfo+;
 #pragma link C++ class TFileInfoMeta+;
 #pragma link C++ class TFileCollection+;
-#pragma link C++ class TVirtualAuth;
+#pragma link C++ class ROOT::Deprecated::TVirtualAuth;
 #pragma link C++ class TVirtualMutex;
 #pragma link C++ class ROOT::TVirtualRWMutex;
 #pragma link C++ class TLockGuard;

core/base/inc/TROOT.h

@@ -99,10 +99,15 @@ namespace ROOT {
    UInt_t GetThreadPoolSize();
 }
 
+namespace ROOT::Deprecated::Internal {
+TSeqCollection *GetListOfSecContexts(const TROOT &);
+} // namespace ROOT::Deprecated::Internal
+
 class TROOT : public TDirectory {
 
 friend class TCling;
 friend TROOT *ROOT::Internal::GetROOT2();
+friend TSeqCollection *ROOT::Deprecated::Internal::GetListOfSecContexts(const TROOT &);
 
 private:
    Int_t           fLineIsProcessing = 0;   ///< To synchronize multi-threads
@@ -256,7 +261,9 @@ friend TROOT *ROOT::Internal::GetROOT2();
    TSeqCollection   *GetListOfStreamerInfo() const { return fStreamerInfo; }
    TSeqCollection   *GetListOfMessageHandlers() const { return fMessageHandlers; }
    TCollection      *GetListOfClassGenerators() const { return fClassGenerators; }
-   TSeqCollection   *GetListOfSecContexts() const { return fSecContexts; }
+   TSeqCollection   *GetListOfSecContexts() const
+      R__DEPRECATED(6, 42, "GetListOfSecContexts is deprecated. See README.AUTH for details.")
+      { return ROOT::Deprecated::Internal::GetListOfSecContexts(*this); }
    TSeqCollection   *GetClipboard() const { return fClipboard; }
    TSeqCollection   *GetListOfDataSets() const { return fDataSets; }
    TCollection      *GetListOfEnums(Bool_t load = kFALSE);

core/base/inc/TVirtualAuth.h

@@ -21,9 +21,12 @@
 
 #include "Rtypes.h"
 
-class TSecContext;
 class TSocket;
 
+namespace ROOT::Deprecated {
+
+class TSecContext;
+
 class TVirtualAuth {
 
 public:
@@ -39,4 +42,10 @@ class TVirtualAuth {
    ClassDef(TVirtualAuth,0)  // client auth interface
 };
 
+} // namespace ROOT::Deprecated
+
+using TVirtualAuth R__DEPRECATED(6, 42, "TVirtualAuth is deprecated. ROOT will not provide "
+   "socket authentication anymore but assumes that TSocket connections are between trusted processes. "
+   "Consider using SSH tunneling if you need secure network connections.") = ROOT::Deprecated::TVirtualAuth;
+
 #endif

core/base/src/TROOT.cxx

@@ -170,6 +170,11 @@ FARPROC dlsym(void *library, const char *function_name)
 #include "TWinNTSystem.h"
 #endif
 
+TSeqCollection *ROOT::Deprecated::Internal::GetListOfSecContexts(const TROOT &r)
+{
+   return r.fSecContexts;
+}
+
 extern "C" void R__SetZipMode(int);
 
 static DestroyInterpreter_t *gDestroyInterpreter = nullptr;
@@ -2835,7 +2840,7 @@ void TROOT::SetBatch(Bool_t batch)
 ///    interactive mode.
 ///  - "server:port": turns the web display into server mode with specified port. Web widgets will not be displayed,
 ///    only text message with window URL will be printed on standard output
-///  
+///
 /// \note See more details related to webdisplay on RWebWindowsManager::ShowWindow
 
 void TROOT::SetWebDisplay(const char *webdisplay)

etc/plugins/TFile/P120_TNetFile.C

@@ -1,17 +1,17 @@
 void P120_TNetFile()
 {
-   gPluginMgr->AddHandler("TFile", "^rootd:", "TNetFile",
-      "Net", "TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
-   gPluginMgr->AddHandler("TFile", "^rootup:", "TNetFile",
-      "Net", "TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
-   gPluginMgr->AddHandler("TFile", "^roots:", "TNetFile",
-      "Net", "TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
-   gPluginMgr->AddHandler("TFile", "^rootk:", "TNetFile",
-      "Net", "TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
-   gPluginMgr->AddHandler("TFile", "^rootg:", "TNetFile",
-      "Net", "TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
-   gPluginMgr->AddHandler("TFile", "^rooth:", "TNetFile",
-      "Net", "TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
-   gPluginMgr->AddHandler("TFile", "^rootug:", "TNetFile",
-      "Net", "TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
+   gPluginMgr->AddHandler("TFile", "^rootd:", "ROOT::Deprecated::TNetFile",
+      "Net", "ROOT::Deprecated::TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
+   gPluginMgr->AddHandler("TFile", "^rootup:", "ROOT::Deprecated::TNetFile",
+      "Net", "ROOT::Deprecated::TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
+   gPluginMgr->AddHandler("TFile", "^roots:", "ROOT::Deprecated::TNetFile",
+      "Net", "ROOT::Deprecated::TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
+   gPluginMgr->AddHandler("TFile", "^rootk:", "ROOT::Deprecated::TNetFile",
+      "Net", "ROOT::Deprecated::TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
+   gPluginMgr->AddHandler("TFile", "^rootg:", "ROOT::Deprecated::TNetFile",
+      "Net", "ROOT::Deprecated::TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
+   gPluginMgr->AddHandler("TFile", "^rooth:", "ROOT::Deprecated::TNetFile",
+      "Net", "ROOT::Deprecated::TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
+   gPluginMgr->AddHandler("TFile", "^rootug:", "ROOT::Deprecated::TNetFile",
+      "Net", "ROOT::Deprecated::TNetFile(const char*,Option_t*,const char*,Int_t,Int_t)");
 }

etc/plugins/TFileStager/P020_TNetFileStager.C

@@ -1,17 +1,17 @@
 void P020_TNetFileStager()
 {
-   gPluginMgr->AddHandler("TFileStager", "^rootd:", "TNetFileStager",
-      "Net", "TNetFileStager(const char *)");
-   gPluginMgr->AddHandler("TFileStager", "^rootup:", "TNetFileStager",
-      "Net", "TNetFileStager(const char *)");
-   gPluginMgr->AddHandler("TFileStager", "^roots:", "TNetFileStager",
-      "Net", "TNetFileStager(const char *)");
-   gPluginMgr->AddHandler("TFileStager", "^rootk:", "TNetFileStager",
-      "Net", "TNetFileStager(const char *)");
-   gPluginMgr->AddHandler("TFileStager", "^rootg:", "TNetFileStager",
-      "Net", "TNetFileStager(const char *)");
-   gPluginMgr->AddHandler("TFileStager", "^rooth:", "TNetFileStager",
-      "Net", "TNetFileStager(const char *)");
-   gPluginMgr->AddHandler("TFileStager", "^rootug:", "TNetFileStager",
-      "Net", "TNetFileStager(const char *)");
+   gPluginMgr->AddHandler("TFileStager", "^rootd:", "ROOT::Deprecated::TNetFileStager",
+      "Net", "ROOT::Deprecated::TNetFileStager(const char *)");
+   gPluginMgr->AddHandler("TFileStager", "^rootup:", "ROOT::Deprecated::TNetFileStager",
+      "Net", "ROOT::Deprecated::TNetFileStager(const char *)");
+   gPluginMgr->AddHandler("TFileStager", "^roots:", "ROOT::Deprecated::TNetFileStager",
+      "Net", "ROOT::Deprecated::TNetFileStager(const char *)");
+   gPluginMgr->AddHandler("TFileStager", "^rootk:", "ROOT::Deprecated::TNetFileStager",
+      "Net", "ROOT::Deprecated::TNetFileStager(const char *)");
+   gPluginMgr->AddHandler("TFileStager", "^rootg:", "ROOT::Deprecated::TNetFileStager",
+      "Net", "ROOT::Deprecated::TNetFileStager(const char *)");
+   gPluginMgr->AddHandler("TFileStager", "^rooth:", "ROOT::Deprecated::TNetFileStager",
+      "Net", "ROOT::Deprecated::TNetFileStager(const char *)");
+   gPluginMgr->AddHandler("TFileStager", "^rootug:", "ROOT::Deprecated::TNetFileStager",
+      "Net", "ROOT::Deprecated::TNetFileStager(const char *)");
 }

etc/plugins/TSystem/P070_TNetSystem.C

@@ -1,17 +1,17 @@
 void P070_TNetSystem()
 {
-   gPluginMgr->AddHandler("TSystem", "^rootd:", "TNetSystem",
-      "Net", "TNetSystem(const char *,Bool_t)");
-   gPluginMgr->AddHandler("TSystem", "^rootup:", "TNetSystem",
-      "Net", "TNetSystem(const char *,Bool_t)");
-   gPluginMgr->AddHandler("TSystem", "^roots:", "TNetSystem",
-      "Net", "TNetSystem(const char *,Bool_t)");
-   gPluginMgr->AddHandler("TSystem", "^rootk:", "TNetSystem",
-      "Net", "TNetSystem(const char *,Bool_t)");
-   gPluginMgr->AddHandler("TSystem", "^rootg:", "TNetSystem",
-      "Net", "TNetSystem(const char *,Bool_t)");
-   gPluginMgr->AddHandler("TSystem", "^rooth:", "TNetSystem",
-      "Net", "TNetSystem(const char *,Bool_t)");
-   gPluginMgr->AddHandler("TSystem", "^rootug:", "TNetSystem",
-      "Net", "TNetSystem(const char *,Bool_t)");
+   gPluginMgr->AddHandler("TSystem", "^rootd:", "ROOT::Deprecated::TNetSystem",
+      "Net", "ROOT::Deprecated::TNetSystem(const char *,Bool_t)");
+   gPluginMgr->AddHandler("TSystem", "^rootup:", "ROOT::Deprecated::TNetSystem",
+      "Net", "ROOT::Deprecated::TNetSystem(const char *,Bool_t)");
+   gPluginMgr->AddHandler("TSystem", "^roots:", "ROOT::Deprecated::TNetSystem",
+      "Net", "ROOT::Deprecated::TNetSystem(const char *,Bool_t)");
+   gPluginMgr->AddHandler("TSystem", "^rootk:", "ROOT::Deprecated::TNetSystem",
+      "Net", "ROOT::Deprecated::TNetSystem(const char *,Bool_t)");
+   gPluginMgr->AddHandler("TSystem", "^rootg:", "ROOT::Deprecated::TNetSystem",
+      "Net", "ROOT::Deprecated::TNetSystem(const char *,Bool_t)");
+   gPluginMgr->AddHandler("TSystem", "^rooth:", "ROOT::Deprecated::TNetSystem",
+      "Net", "ROOT::Deprecated::TNetSystem(const char *,Bool_t)");
+   gPluginMgr->AddHandler("TSystem", "^rootug:", "ROOT::Deprecated::TNetSystem",
+      "Net", "ROOT::Deprecated::TNetSystem(const char *,Bool_t)");
 }

etc/plugins/TVirtualAuth/P010_TRootAuth.C

@@ -1,5 +1,5 @@
 void P010_TRootAuth()
 {
-   gPluginMgr->AddHandler("TVirtualAuth", "Root", "TRootAuth",
-      "RootAuth", "TRootAuth()");
+   gPluginMgr->AddHandler("TVirtualAuth", "Root", "ROOT::Deprecated::TRootAuth",
+      "RootAuth", "ROOT::Deprecated::TRootAuth()");
 }

io/io/src/TFile.cxx

@@ -3985,7 +3985,7 @@ TFile *TFile::Open(const char *url, Option_t *options, const char *ftitle,
                if (h->LoadPlugin() == -1)
                   return nullptr;
                TClass *cl = TClass::GetClass(h->GetClass());
-               if (cl && cl->InheritsFrom("TNetFile"))
+               if (cl && cl->InheritsFrom("ROOT::Deprecated::TNetFile"))
                   f = (TFile*) h->ExecPlugin(5, name.Data(), option, ftitle, compress, netopt);
                else
                   f = (TFile*) h->ExecPlugin(4, name.Data(), option, ftitle, compress);

net/auth/inc/AuthConst.h

@@ -22,6 +22,8 @@
 
 #include "RtypesCore.h"
 
+namespace ROOT::Deprecated {
+
 // Number of security levels and masks
 const Int_t       kMAXSEC         = 6;
 const Int_t       kMAXSECBUF      = 4096;
@@ -33,4 +35,20 @@ const Int_t       kMAXRSATRIES    = 100;
 const Int_t       kPRIMELENGTH    = 20;
 const Int_t       kPRIMEEXP       = 40;
 
+} // namespace ROOT::Deprecated
+
+const Int_t kMAXSEC R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::kMAXSEC;
+const Int_t kMAXSECBUF R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::kMAXSECBUF;
+const Int_t kAUTH_REUSE_MSK R__DEPRECATED(6, 42, "the RootAuth library is deprecated") =
+   ROOT::Deprecated::kAUTH_REUSE_MSK;
+const Int_t kAUTH_CRYPT_MSK R__DEPRECATED(6, 42, "the RootAuth library is deprecated") =
+   ROOT::Deprecated::kAUTH_CRYPT_MSK;
+const Int_t kAUTH_SSALT_MSK R__DEPRECATED(6, 42, "the RootAuth library is deprecated") =
+   ROOT::Deprecated::kAUTH_SSALT_MSK;
+const Int_t kAUTH_RSATY_MSK R__DEPRECATED(6, 42, "the RootAuth library is deprecated") =
+   ROOT::Deprecated::kAUTH_RSATY_MSK;
+const Int_t kMAXRSATRIES R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::kMAXRSATRIES;
+const Int_t kPRIMELENGTH R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::kPRIMELENGTH;
+const Int_t kPRIMEEXP R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::kPRIMEEXP;
+
 #endif

net/auth/inc/LinkDefRoot.h

@@ -12,9 +12,9 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class TAuthenticate;
-#pragma link C++ class THostAuth;
-#pragma link C++ class TRootAuth;
-#pragma link C++ class TRootSecContext;
+#pragma link C++ class ROOT::Deprecated::TAuthenticate;
+#pragma link C++ class ROOT::Deprecated::THostAuth;
+#pragma link C++ class ROOT::Deprecated::TRootAuth;
+#pragma link C++ class ROOT::Deprecated::TRootSecContext;
 
 #endif

net/auth/inc/TAuthenticate.h

@@ -30,30 +30,33 @@
 #endif
 #include "AuthConst.h"
 
-class TAuthenticate;
-class THostAuth;
 class TPluginHandler;
 class TSocket;
-class TRootSecContext;
 class TVirtualMutex;
 
-typedef Int_t (*CheckSecCtx_t)(const char *subj, TRootSecContext *ctx);
-typedef Int_t (*GlobusAuth_t)(TAuthenticate *auth, TString &user, TString &det);
-typedef Int_t (*Krb5Auth_t)(TAuthenticate *auth, TString &user, TString &det, Int_t version);
-typedef Int_t (*SecureAuth_t)(TAuthenticate *auth, const char *user, const char *passwd,
-                              const char *remote, TString &det, Int_t version);
-
-R__EXTERN TVirtualMutex *gAuthenticateMutex;
+namespace ROOT::Deprecated {
 
 struct R__rsa_KEY; // opaque replacement for rsa_KEY
 struct R__rsa_KEY_export; // opaque replacement for rsa_KEY_export
 struct R__rsa_NUMBER; // opaque replacement for rsa_NUMBER
 
+R__EXTERN TVirtualMutex *gAuthenticateMutex;
+
+class TAuthenticate;
+class THostAuth;
+class TRootAuth;
+class TRootSecContext;
+
+typedef Int_t (*CheckSecCtx_t)(const char *subj, ROOT::Deprecated::TRootSecContext *ctx);
+typedef Int_t (*GlobusAuth_t)(ROOT::Deprecated::TAuthenticate *auth, TString &user, TString &det);
+typedef Int_t (*Krb5Auth_t)(ROOT::Deprecated::TAuthenticate *auth, TString &user, TString &det, Int_t version);
+typedef Int_t (*SecureAuth_t)(ROOT::Deprecated::TAuthenticate *auth, const char *user, const char *passwd,
+                              const char *remote, TString &det, Int_t version);
+
 class TAuthenticate : public TObject {
 
-friend class TRootAuth;
-friend class TRootSecContext;
-friend class TSocket;
+friend class ROOT::Deprecated::TRootAuth;
+friend class ROOT::Deprecated::TRootSecContext;
 
 public:
    enum ESecurity {
@@ -172,13 +175,13 @@ friend class TSocket;
    static const char *GetGlobalUser();
    static GlobusAuth_t GetGlobusAuthHook();
    static THostAuth  *GetHostAuth(const char *host, const char *user="",
-                                  Option_t *opt = "R", Int_t *Exact = nullptr);
+                                                    Option_t *opt = "R", Int_t *Exact = nullptr);
    static const char *GetKrb5Principal();
    static Bool_t      GetPromptUser();
    static Int_t       GetRSAInit();
    static const char *GetRSAPubExport(Int_t key = 0);
    static THostAuth  *HasHostAuth(const char *host, const char *user,
-                                  Option_t *opt = "R");
+                                                    Option_t *opt = "R");
    static void        InitRandom();
    static void        MergeHostAuthList(TList *Std, TList *New, Option_t *Opt = "");
    static char       *PromptPasswd(const char *prompt = "Password: ");
@@ -210,4 +213,14 @@ friend class TSocket;
    ClassDefOverride(TAuthenticate,0)  // Class providing remote authentication service
 };
 
+} // namespace ROOT::Deprecated
+
+R__EXTERN TVirtualMutex *&gAuthenticateMutex R__DEPRECATED(6, 42, "the RootAuth library is deprecated");
+
+using CheckSecCtx_t R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::CheckSecCtx_t;
+using GlobusAuth_t R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::GlobusAuth_t;
+using Krb5Auth_t R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::Krb5Auth_t;
+using SecureAuth_t R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::SecureAuth_t;
+using TAuthenticate R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::TAuthenticate;
+
 #endif

net/auth/inc/THostAuth.h

@@ -31,6 +31,8 @@
 
 #include "TSecContext.h" // for kROOTTZERO.
 
+namespace ROOT::Deprecated {
+
 class THostAuth : public TObject {
 
 private:
@@ -110,4 +112,8 @@ class THostAuth : public TObject {
    ClassDefOverride(THostAuth,1)  // Class providing host specific authentication information
 };
 
+} // namespace ROOT::Deprecated
+
+using THostAuth R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::THostAuth;
+
 #endif

net/auth/inc/TRootAuth.h

@@ -25,9 +25,12 @@
 #include "TVirtualAuth.h"
 #include "Rtypes.h"
 
-class TSecContext;
 class TSocket;
 
+namespace ROOT::Deprecated {
+
+class TSecContext;
+
 class TRootAuth : public TVirtualAuth {
 
 public:
@@ -43,4 +46,8 @@ class TRootAuth : public TVirtualAuth {
    ClassDefOverride(TRootAuth,0)  // client auth interface
 };
 
+} // namespace ROOT::Deprecated
+
+using TRootAuth R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::TRootAuth;
+
 #endif

net/auth/inc/TRootSecContext.h

@@ -24,6 +24,8 @@
 #include "TAuthenticate.h"
 #include "TSecContext.h"
 
+namespace ROOT::Deprecated {
+
 class TRootSecContext : public TSecContext {
 
 private:
@@ -51,4 +53,8 @@ class TRootSecContext : public TSecContext {
    ClassDefOverride(TRootSecContext,0)  // Class providing host specific authentication information
 };
 
+}
+
+using TRootSecContext R__DEPRECATED(6, 42, "the RootAuth library is deprecated") = ROOT::Deprecated::TRootSecContext;
+
 #endif