gpgv: cleanup statusfd parsing a bit

[apt.git] / methods / rsh.cc

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 0e949160bba35f7e7e4cf310ea28185f18c42ff9..4d133951f0bd85d8b2e1ffad5544cc76c29b1e2f 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -34,7 +34,6 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-const char *Prog;

 unsigned long TimeOut = 120;
 Configuration::Item const *RshOptions = 0;
 time_t RSHMethod::FailTime = 0;
 unsigned long TimeOut = 120;
 Configuration::Item const *RshOptions = 0;
 time_t RSHMethod::FailTime = 0;


@@ -44,8 +43,8 @@ int RSHMethod::FailFd = -1;
 // RSHConn::RSHConn - Constructor                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RSHConn::RSHConn - Constructor                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-RSHConn::RSHConn(URI Srv) : Len(0), WriteFd(-1), ReadFd(-1),
-                            ServerName(Srv), Process(-1) {
+RSHConn::RSHConn(std::string const &pProg, URI Srv) : Len(0), WriteFd(-1), ReadFd(-1),
+                            ServerName(Srv), Prog(pProg), Process(-1) {

    Buffer[0] = '\0';
 }
                                                                        /*}}}*/
    Buffer[0] = '\0';
 }
                                                                        /*}}}*/


@@ -84,7 +83,7 @@ bool RSHConn::Open()
    if (Process != -1)
       return true;
 
    if (Process != -1)
       return true;
 

-   if (Connect(ServerName.Host,ServerName.User) == false)
+   if (Connect(ServerName.Host,ServerName.Port,ServerName.User) == false)

       return false;
 
    return true;
       return false;
 
    return true;


@@ -93,8 +92,15 @@ bool RSHConn::Open()
 // RSHConn::Connect - Fire up rsh and connect                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RSHConn::Connect - Fire up rsh and connect                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool RSHConn::Connect(std::string Host, std::string User)
+bool RSHConn::Connect(std::string Host, unsigned int Port, std::string User)

 {
 {

+   char *PortStr = NULL;
+   if (Port != 0)
+   {
+      if (asprintf (&PortStr, "%d", Port) == -1 || PortStr == NULL)
+         return _error->Errno("asprintf", _("Failed"));
+   }
+

    // Create the pipes
    int Pipes[4] = {-1,-1,-1,-1};
    if (pipe(Pipes) != 0 || pipe(Pipes+2) != 0)
    // Create the pipes
    int Pipes[4] = {-1,-1,-1,-1};
    if (pipe(Pipes) != 0 || pipe(Pipes+2) != 0)


@@ -121,7 +127,7 @@ bool RSHConn::Connect(std::string Host, std::string User)
       // Probably should do
       // dup2(open("/dev/null",O_RDONLY),STDERR_FILENO);
 
       // Probably should do
       // dup2(open("/dev/null",O_RDONLY),STDERR_FILENO);
 

-      Args[i++] = Prog;
+      Args[i++] = Prog.c_str();

 
       // Insert user-supplied command line options
       Configuration::Item const *Opts = RshOptions;
 
       // Insert user-supplied command line options
       Configuration::Item const *Opts = RshOptions;


@@ -140,6 +146,10 @@ bool RSHConn::Connect(std::string Host, std::string User)
          Args[i++] = "-l";
         Args[i++] = User.c_str();
       }
          Args[i++] = "-l";
         Args[i++] = User.c_str();
       }

+      if (PortStr != NULL) {
+         Args[i++] = "-p";
+         Args[i++] = PortStr;
+      }

       if (Host.empty() == false) {
          Args[i++] = Host.c_str();
       }
       if (Host.empty() == false) {
          Args[i++] = Host.c_str();
       }


@@ -149,6 +159,9 @@ bool RSHConn::Connect(std::string Host, std::string User)
       exit(100);
    }
 
       exit(100);
    }
 

+   if (PortStr != NULL)
+      free(PortStr);
+

    ReadFd = Pipes[0];
    WriteFd = Pipes[3];
    SetNonBlock(Pipes[0],true);
    ReadFd = Pipes[0];
    WriteFd = Pipes[3];
    SetNonBlock(Pipes[0],true);


@@ -157,6 +170,10 @@ bool RSHConn::Connect(std::string Host, std::string User)
    close(Pipes[2]);
    
    return true;
    close(Pipes[2]);
    
    return true;

+}
+bool RSHConn::Connect(std::string Host, std::string User)
+{
+   return Connect(Host, 0, User);

 }
                                                                        /*}}}*/
 // RSHConn::ReadLine - Very simple buffered read with timeout          /*{{{*/
 }
                                                                        /*}}}*/
 // RSHConn::ReadLine - Very simple buffered read with timeout          /*{{{*/


@@ -369,7 +386,7 @@ bool RSHConn::Get(const char *Path,FileFd &To,unsigned long long Resume,
 // RSHMethod::RSHMethod - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RSHMethod::RSHMethod - Constructor                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-RSHMethod::RSHMethod() : pkgAcqMethod("1.0",SendConfig)
+RSHMethod::RSHMethod(std::string const &pProg) : aptMethod(pProg.c_str(),"1.0",SendConfig), Prog(pProg)

 {
    signal(SIGTERM,SigTerm);
    signal(SIGINT,SigTerm);
 {
    signal(SIGTERM,SigTerm);
    signal(SIGINT,SigTerm);


@@ -381,15 +398,17 @@ RSHMethod::RSHMethod() : pkgAcqMethod("1.0",SendConfig)
 // ---------------------------------------------------------------------
 bool RSHMethod::Configuration(std::string Message)
 {
 // ---------------------------------------------------------------------
 bool RSHMethod::Configuration(std::string Message)
 {

-   char ProgStr[100];
-  
-   if (pkgAcqMethod::Configuration(Message) == false)
+   // enabling privilege dropping for this method requires configuration…
+   // … which is otherwise lifted straight from root, so use it by default.
+   _config->Set(std::string("Binary::") + Prog + "::APT::Sandbox::User", "");
+
+   if (aptMethod::Configuration(Message) == false)

       return false;
 
       return false;
 

-   snprintf(ProgStr, sizeof ProgStr, "Acquire::%s::Timeout", Prog);
-   TimeOut = _config->FindI(ProgStr,TimeOut);
-   snprintf(ProgStr, sizeof ProgStr, "Acquire::%s::Options", Prog);
-   RshOptions = _config->Tree(ProgStr);
+   std::string const timeconf = std::string("Acquire::") + Prog + "::Timeout";
+   TimeOut = _config->FindI(timeconf, TimeOut);
+   std::string const optsconf = std::string("Acquire::") + Prog + "::Options";
+   RshOptions = _config->Tree(optsconf.c_str());

 
    return true;
 }
 
    return true;
 }


@@ -427,7 +446,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
    // Connect to the server
    if (Server == 0 || Server->Comp(Get) == false) {
       delete Server;
    // Connect to the server
    if (Server == 0 || Server->Comp(Get) == false) {
       delete Server;

-      Server = new RSHConn(Get);
+      Server = new RSHConn(Prog, Get);

    }
 
    // Could not connect is a transient error..
    }
 
    // Could not connect is a transient error..


@@ -477,7 +496,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
    }
 
    // Open the file
    }
 
    // Open the file

-   Hashes Hash;
+   Hashes Hash(Itm->ExpectedHashes);

    {
       FileFd Fd(Itm->DestFile,FileFd::WriteAny);
       if (_error->PendingError() == true)
    {
       FileFd Fd(Itm->DestFile,FileFd::WriteAny);
       if (_error->PendingError() == true)


@@ -486,7 +505,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
       URIStart(Res);
 
       FailFile = Itm->DestFile;
       URIStart(Res);
 
       FailFile = Itm->DestFile;

-      FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
+      FailFile.c_str();   // Make sure we don't do a malloc in the signal handler

       FailFd = Fd.Fd();
 
       bool Missing;
       FailFd = Fd.Fd();
 
       bool Missing;


@@ -530,8 +549,6 @@ int main(int, const char *argv[])
 {
    setlocale(LC_ALL, "");
 
 {
    setlocale(LC_ALL, "");
 

-   RSHMethod Mth;
-   Prog = strrchr(argv[0],'/');
-   Prog++;
+   RSHMethod Mth(flNotDir(argv[0]));

    return Mth.Run();
 }
    return Mth.Run();
 }