From 30c8107e9c56d7d78dcf9136f94aeed9d631dfb3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 4 Nov 2015 13:19:14 +0100 Subject: drop privileges in copy:// method as we do for file:// Continueing on the track of dropping privileges in all methods, lets drop it in copy, too, as the reasoning for it is very similar to file and the interaction between the too quiet interesting as copy kinda surfed as a fallback for file not being able to read the file. Both now show a better error message as well as it was previously claiming to have a hashsum mismatch, given that it couldn't read the file. Git-Dch: Ignore --- methods/aptmethod.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 methods/aptmethod.h (limited to 'methods/aptmethod.h') diff --git a/methods/aptmethod.h b/methods/aptmethod.h new file mode 100644 index 000000000..61d7b78f1 --- /dev/null +++ b/methods/aptmethod.h @@ -0,0 +1,37 @@ +#ifndef APT_APTMETHOD_H +#define APT_APTMETHOD_H + +#include + +#include + +class aptMethod : public pkgAcqMethod +{ + char const * const Binary; + public: + virtual bool Configuration(std::string Message) APT_OVERRIDE; + + bool CalculateHashes(FetchItem const * const Itm, FetchResult &Res) const; + + aptMethod(char const * const Binary, char const * const Ver, unsigned long const Flags) : pkgAcqMethod(Ver, Flags), Binary(Binary) {}; +}; +bool aptMethod::Configuration(std::string Message) +{ + if (pkgAcqMethod::Configuration(Message) == false) + return false; + + DropPrivsOrDie(); + + return true; +} +bool aptMethod::CalculateHashes(FetchItem const * const Itm, FetchResult &Res) const +{ + Hashes Hash(Itm->ExpectedHashes); + FileFd Fd; + if (Fd.Open(Res.Filename, FileFd::ReadOnly) == false || Hash.AddFD(Fd) == false) + return false; + Res.TakeHashes(Hash); + return true; +} + +#endif -- cgit v1.2.3