X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e43a426e5d402d36eb180935fbbf1430a4a86e3f..0a778f71f935900ff8a90a958f0e7da700d84f9f:/cmdline/apt-helper.cc

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index c1c8b2178..1be122ad0 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -7,6 +7,7 @@
 // Include Files							/*{{{*/
 #include <config.h>
 
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
@@ -15,113 +16,125 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/proxy.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-output.h>
+#include <apt-private/private-download.h>
 #include <apt-private/private-cmndline.h>
+#include <apt-private/private-main.h>
+#include <apt-pkg/srvrec.h>
 
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-
-
+#include <iostream>
+#include <string>
+#include <vector>
 
 #include <apti18n.h>
 									/*}}}*/
-using namespace std;
 
-bool DoDownloadFile(CommandLine &CmdL)
+static bool DoAutoDetectProxy(CommandLine &CmdL)			/*{{{*/
+{
+   if (CmdL.FileSize() != 2)
+      return _error->Error(_("Need one URL as argument"));
+   URI ServerURL(CmdL.FileList[1]);
+   AutoDetectProxy(ServerURL);
+   std::string SpecificProxy = _config->Find("Acquire::"+ServerURL.Access+"::Proxy::" + ServerURL.Host);
+   ioprintf(std::cout, "Using proxy '%s' for URL '%s'\n",
+            SpecificProxy.c_str(), std::string(ServerURL).c_str());
+
+   return true;
+}
+									/*}}}*/
+static bool DoDownloadFile(CommandLine &CmdL)				/*{{{*/
 {
    if (CmdL.FileSize() <= 2)
       return _error->Error(_("Must specify at least one pair url/filename"));
 
-
-   pkgAcquire Fetcher;
-   AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
-   Fetcher.Setup(&Stat);
-   std::string download_uri = CmdL.FileList[1];
-   std::string targetfile = CmdL.FileList[2];
-   new pkgAcqFile(&Fetcher, download_uri, "", 0, "desc", "short-desc", 
-                  "dest-dir-ignored", targetfile);
-   Fetcher.Run();
-   if (!FileExists(targetfile))
+   aptAcquireWithTextStatus Fetcher;
+   size_t fileind = 0;
+   std::vector<std::string> targetfiles;
+   while (fileind + 2 <= CmdL.FileSize())
    {
-      _error->Error(_("Download Failed"));
-      return false;
+      std::string download_uri = CmdL.FileList[fileind + 1];
+      std::string targetfile = CmdL.FileList[fileind + 2];
+      std::string hash;
+      if (CmdL.FileSize() > fileind + 3)
+	 hash = CmdL.FileList[fileind + 3];
+      // we use download_uri as descr and targetfile as short-descr
+      new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile,
+	    "dest-dir-ignored", targetfile);
+      targetfiles.push_back(targetfile);
+      fileind += 3;
    }
-   return true;
-}
-
-bool ShowHelp(CommandLine &CmdL)
-{
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-	    COMMON_ARCH,__DATE__,__TIME__);
 
-   if (_config->FindB("version") == true)
-     return true;
+   bool Failed = false;
+   if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
+      return _error->Error(_("Download Failed"));
+   if (targetfiles.empty() == false)
+      for (std::vector<std::string>::const_iterator f = targetfiles.begin(); f != targetfiles.end(); ++f)
+	 if (FileExists(*f) == false)
+	    return _error->Error(_("Download Failed"));
 
-   cout << 
-    _("Usage: apt-helper [options] command\n"
-      "       apt-helper [options] download-file uri target-path\n"
-      "\n"
-      "apt-helper is a internal helper for apt\n"
-      "\n"
-      "Commands:\n"
-      "   download-file - download the given uri to the target-path\n"
-      "\n"
-      "                       This APT helper has Super Meep Powers.\n");
    return true;
 }
-
-
-int main(int argc,const char *argv[])					/*{{{*/
+									/*}}}*/
+static bool DoSrvLookup(CommandLine &CmdL)				/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
-				   {"download-file", &DoDownloadFile},
-                                   {0,0}};
-
-   std::vector<CommandLine::Args> Args = getCommandArgs(
-      "apt-download", CommandLine::GetCommand(Cmds, argc, argv));
+   if (CmdL.FileSize() <= 1)
+      return _error->Error("Must specify at least one SRV record");
 
-   // Set up gettext support
-   setlocale(LC_ALL,"");
-   textdomain(PACKAGE);
-
-   // Parse the command line and initialize the package library
-   CommandLine CmdL(Args.data(),_config);
-   if (pkgInitConfig(*_config) == false ||
-       CmdL.Parse(argc,argv) == false ||
-       pkgInitSystem(*_config,_system) == false)
+   for(size_t i = 1; CmdL.FileList[i] != NULL; ++i)
    {
-      if (_config->FindB("version") == true)
-	 ShowHelp(CmdL);
-      _error->DumpErrors();
-      return 100;
+      std::vector<SrvRec> srv_records;
+      std::string const name = CmdL.FileList[i];
+      c0out << "# Target\tPriority\tWeight\tPort # for " << name << std::endl;
+      size_t const found = name.find(":");
+      if (found != std::string::npos)
+      {
+	 std::string const host = name.substr(0, found);
+	 size_t const port = atoi(name.c_str() + found + 1);
+	 if(GetSrvRecords(host, port, srv_records) == false)
+	    _error->Error(_("GetSrvRec failed for %s"), name.c_str());
+      }
+      else if(GetSrvRecords(name, srv_records) == false)
+	 _error->Error(_("GetSrvRec failed for %s"), name.c_str());
+
+      for (SrvRec const &I : srv_records)
+	 c1out << I.target << "\t" << I.priority << "\t" << I.weight << "\t" << I.port << std::endl;
    }
+   return true;
+}
+									/*}}}*/
+bool ShowHelp(CommandLine &)						/*{{{*/
+{
+   std::cout <<
+      _("Usage: apt-helper [options] command\n"
+	    "       apt-helper [options] download-file uri target-path\n"
+	    "\n"
+	    "apt-helper bundles a variety of commands for shell scripts to use\n"
+	    "e.g. the same proxy configuration or acquire system as APT would.\n");
+   return true;
+}
+									/*}}}*/
+std::vector<aptDispatchWithHelp> GetCommands()				/*{{{*/
+{
+   return {
+      {"download-file", &DoDownloadFile, _("download the given uri to the target-path")},
+      {"srv-lookup", &DoSrvLookup, _("lookup a SRV record (e.g. _http._tcp.ftp.debian.org)")},
+      {"auto-detect-proxy", &DoAutoDetectProxy, _("detect proxy using apt.conf")},
+      {nullptr, nullptr, nullptr}
+   };
+}
+									/*}}}*/
+int main(int argc,const char *argv[])					/*{{{*/
+{
+   InitLocale();
 
-   // See if the help should be shown
-   if (_config->FindB("help") == true ||
-       _config->FindB("version") == true ||
-       CmdL.FileSize() == 0)
-   {
-      ShowHelp(CmdL);
-      return 0;
-   }
+   CommandLine CmdL;
+   auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    InitOutput();
 
-   // Match the operation
-   CmdL.DispatchArg(Cmds);
-
-   // Print any errors or warnings found during parsing
-   bool const Errors = _error->PendingError();
-   if (_config->FindI("quiet",0) > 0)
-      _error->DumpErrors();
-   else
-      _error->DumpErrors(GlobalError::DEBUG);
-   return Errors == true ? 100 : 0;
+   return DispatchCommandLine(CmdL, Cmds);
 }
 									/*}}}*/