[net] deprecate TSocket::IsAuthenticated()

Author: jblomer

net/net/inc/TSocket.h

@@ -35,10 +35,18 @@
 #include "TVirtualMutex.h"
 
 class TMessage;
+class TSocket;
+
+namespace ROOT::Deprecated {
+struct TSocketFriend {
+   static Bool_t IsAuthenticated(const TSocket &s);
+};
+} // namespace ROOT::Deprecated
 
 class TSocket : public TNamed {
 
 friend class TServerSocket;
+friend class ROOT::Deprecated::TSocketFriend;
 
 public:
    enum EStatusBits { kIsUnix = BIT(16),    // set if unix socket
@@ -132,7 +140,9 @@ friend class TServerSocket;
    Int_t                 GetTcpWindowSize() const { return fTcpWindowSize; }
    TTimeStamp            GetLastUsage() { R__LOCKGUARD2(fLastUsageMtx); return fLastUsage; }
    const char           *GetUrl() const { return fUrl.Data(); }
-   virtual Bool_t        IsAuthenticated() const { return fSecContext ? kTRUE : kFALSE; }
+   virtual Bool_t        IsAuthenticated() const
+      R__DEPRECATED(6, 42, "TSocket::IsAuthenticated is deprecated")
+      { return ROOT::Deprecated::TSocketFriend::IsAuthenticated(*this); }
    virtual Bool_t        IsValid() const { return fSocket < 0 ? kFALSE : kTRUE; }
    virtual Int_t         Recv(TMessage *&mess);
    virtual Int_t         Recv(Int_t &status, Int_t &kind);

net/net/src/TFTP.cxx

@@ -103,7 +103,7 @@ void TFTP::Init(const char *surl, Int_t par, Int_t wsize)
    hurl += TString(Form("://%s@%s:%d",
                         url.GetUser(), url.GetHost(), url.GetPort()));
    fSocket = TSocket::CreateAuthSocket(hurl, par, wsize, fSocket);
-   if (!fSocket || !fSocket->IsAuthenticated()) {
+   if (!fSocket || !ROOT::Deprecated::TSocketFriend::IsAuthenticated(*fSocket)) {
       if (par > 1)
          Error("TFTP", "can't open %d-stream connection to rootd on "
                "host %s at port %d", par, url.GetHost(), url.GetPort());
@@ -160,7 +160,7 @@ void TFTP::Print(Option_t *) const
    Printf("Local host:           %s", gSystem->HostName());
    Printf("Remote host:          %s [%d]", fHost.Data(), fPort);
    Printf("Remote user:          %s", fUser.Data());
-   if (fSocket->IsAuthenticated())
+   if (ROOT::Deprecated::TSocketFriend::IsAuthenticated(*fSocket))
       Printf("Security context:     %s",
                                       fSocket->GetSecContext()->AsString(secCont));
    Printf("Rootd protocol vers.: %d", fSocket->GetRemoteProtocol());

net/net/src/TNetFile.cxx

@@ -582,7 +582,7 @@ void TNetFile::ConnectServer(Int_t *stat, EMessageTypes *kind, Int_t netopt,
    url += TString(Form("://%s@%s:%d",
                        fUrl.GetUser(), fUrl.GetHost(), fUrl.GetPort()));
    fSocket = TSocket::CreateAuthSocket(url, sSize, tcpwindowsize, fSocket, stat);
-   if (!fSocket || (fSocket && !fSocket->IsAuthenticated())) {
+   if (!fSocket || (fSocket && !ROOT::Deprecated::TSocketFriend::IsAuthenticated(*fSocket))) {
       if (sSize > 1)
          Error("TNetFile", "can't open %d-stream connection to rootd on "
                "host %s at port %d", sSize, fUrl.GetHost(), fUrl.GetPort());

net/net/src/TPServerSocket.cxx

@@ -136,7 +136,7 @@ TPSocket *TPServerSocket::Accept(UChar_t Opt)
    }
 
    // Transmit authentication information, if any
-   if (setupSocket->IsAuthenticated())
+   if (ROOT::Deprecated::TSocketFriend::IsAuthenticated(*setupSocket))
       newPSocket->SetSecContext(setupSocket->GetSecContext());
 
    // clean up, if needed

net/net/src/TSocket.cxx

@@ -36,6 +36,11 @@
 #include "TStreamerInfo.h"
 #include "TProcessID.h"
 
+Bool_t ROOT::Deprecated::TSocketFriend::IsAuthenticated(const TSocket &s)
+{
+   return s.fSecContext;
+}
+
 
 ULong64_t TSocket::fgBytesSent = 0;
 ULong64_t TSocket::fgBytesRecv = 0;
@@ -1354,7 +1359,7 @@ TSocket *TSocket::CreateAuthSocket(const char *url, Int_t size, Int_t tcpwindows
          sock = new TPSocket(eurl, TUrl(url).GetPort(), size, tcpwindowsize);
 
       // Cleanup if failure ...
-      if (sock && !sock->IsAuthenticated()) {
+      if (sock && !ROOT::Deprecated::TSocketFriend::IsAuthenticated(*sock)) {
          // Nothing to do except setting the error code (if required) and sock to NULL
          if (err) {
             *err = (Int_t)kErrAuthNotOK;