summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename _count() macro to APT_ARRAY_SIZE()Julian Andres Klode2020-01-071-1/+1
|
* Avoid #define _error, use anonymous C++ struct insteadJulian Andres Klode2020-01-072-1/+5
| | | | | | | | | | | | Replace the macro with an anonymous struct that provides an inline operator->() returning the _error pointer. This change is ABI compatible, and the inline macro is not exported. We should consider if we want to avoid the function call and directly export the thread_local variable instead, when we do break ABI. Closes: #948338
* netrc: Restrict auth.conf entries to https by defaultJulian Andres Klode2019-12-021-1/+21
| | | | | | | | | | | | This avoids downgrade attacks where an attacker could inject Location: http://private.example/ and then (having access to raw data to private.example, for example, by opening a port there, or sniffing network traffic) read the credentials for the private repository. Closes: #945911
* Fix some style warnings from cppcheckDavid Kalnischkies2019-11-262-5/+6
| | | | | | | | Unused variable, std::algorithms instead of raw for-loops. There should be no observeable difference in behaviour. Reported-By: cppcheck Gbp-Dch: Ignore
* strutl: Add APT::String::DisplayLength() functionАлексей Шилин2019-11-252-0/+50
| | | | | | Returns string length, but unlike std::string::size() it honors multibyte characters. This allows to properly calculate visible sizes of console messages.
* srvrec: Use re-entrant resolver functionsJulian Andres Klode2019-08-221-2/+7
| | | | | This should probably make those functions thread-safe, which might be useful for some external users.
* Merge branch 'pu/locking-msg' into 'master'Julian Andres Klode2019-08-051-2/+53
|\ | | | | | | | | Improve locking messaging - pid and name, "do not remove lock file" See merge request apt-team/apt!68
| * Improve locking messaging - pid and name, "do not remove lock file"Julian Andres Klode2019-06-211-2/+53
| | | | | | | | | | | | | | | | | | We want to tell users which process is holding the lock so they can easily understand what's going on, and we want to advise users not to remove the lock file, because ugh, that's bad. Re-initalize the flock structure, in case it got mangled by previous fcntl call.
* | Apply various suggestions by cppcheckDavid Kalnischkies2019-07-083-8/+9
|/ | | | Reported-By: cppcheck
* RFC1123StrToTime: Accept const std::string& as first argumentJulian Andres Klode2019-06-173-1/+13
| | | | | | We are converting to std::string anyway by passing to istringstream, and this removes the need for .c_str() in callers.
* Run unifdef -DAPT_{8,9,10,15}_CLEANER_HEADERSJulian Andres Klode2019-06-1217-106/+0
|
* Allow comparing string to StringViewJulian Andres Klode2019-06-111-0/+2
|
* Make APT::StringView publicJulian Andres Klode2019-06-114-26/+5
|
* Change soname to libapt-pkg.so.5.90Julian Andres Klode2019-05-061-2/+2
| | | | | This is a bit experimental, and we'll go through a few stages before reaching libapt-pkg.so.6.0.
* Merge libapt-inst into libapt-pkgJulian Andres Klode2019-05-064-0/+595
|
* Prevent shutdown while running dpkgJulian Andres Klode2019-05-032-0/+50
| | | | | | | As long as we are running dpkg, keep an inhibitor that blocks us from shutting down. LP: #1820886
* apt-pkg: URI: Add 'explicit' to single argument constructorJulian Andres Klode2019-04-301-2/+2
| | | | | This needs a fair amount of changes elsewhere in the code, hence this is separate from the previous commits.
* apt-pkg: hashes: Add 'explicit' to single argument constructorsJulian Andres Klode2019-04-301-5/+5
| | | | | This avoids funny code where strings get implicitly converted to HashString or HashStringList.
* Add 'explicit' to most single argument constructorsJulian Andres Klode2019-04-304-6/+6
| | | | | | | | | | | This prevents implicit conversions that we do not want, such as having a FileFd* being converted to a debListParser. Two cases are not yet handled because they require changes in code using them: 1. The classes in hashes.h 2. The URI class - this one is used quite a lot
* Merge tag '1.8.0'Julian Andres Klode2019-03-081-2/+16
|\ | | | | | | apt Debian release 1.8.0
| * Add explicit message for unsupported binary signatureDavid Kalnischkies2019-03-031-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verifying the content of Release.gpg made us fail on binary signatures which were never officially supported (apt-secure manpage only documents only the generation of ASCII armored), but silently accepted by gpgv as we passed it on unchecked before. The binary format is complex and is itself split into old and new formats so adding support for this would not only add lots of code but also a good opportunity for bugs and dubious benefit. Reporting this issue explicitly should help repository creators figure out the problem faster than the default NODATA message hinting at captive portals. Given that the binary format has no file magic or any other clear and simple indication that this is a detached signature we guess based on the first two bits only – and by that only supporting the "old" binary format which seems to be the only one generated by gnupg in this case. References: e2965b0b6bdd68ffcad0e06d11755412a7e16e50 Closes: #921685
* | fileutl: Merge Popen variantsJulian Andres Klode2019-02-262-13/+1
| |
* | fileutl: Remove deprecated functions such as gzFd()Julian Andres Klode2019-02-262-28/+0
| |
* | strutl: Remove deprecated functionsJulian Andres Klode2019-02-262-57/+0
| |
* | sptr: Remove deprecated smart pointer classesJulian Andres Klode2019-02-262-75/+0
| | | | | | | | Please use the standard C++ variants instead.
* | netrc: Remove deprecated function maybe_add_auth()Julian Andres Klode2019-02-262-11/+0
| |
* | hashes: Remove deprecated functionsJulian Andres Klode2019-02-262-58/+6
| | | | | | | | | | | | This keeps the members in the class, but makes them private. We want to migrate to libgcrypt eventually, since we already use libgcrypt through gpgv anyway.
* | Bump SONAMEs in preparation for ABI breaksJulian Andres Klode2019-02-261-2/+2
|/
* Fix various typos in the documentationJakub Wilk2019-02-101-1/+1
|
* Use std::to_string() for HashStringList::FileSize() getterJulian Andres Klode2019-02-041-3/+1
| | | | | | | | This slightly improves performance, as std::to_string() (as in gcc's libstdc++) avoids a heap allocation. This is surprisingly performance critical code, so we might want to improve things further in 1.9 by manually calculating the string - that would also get rid of issues with locales changing string formatting, if any.
* gpgv: Use buffered writes for splitting clearsigned filesJulian Andres Klode2019-02-043-2/+13
| | | | | | This is safe here, as the code ensures that the file is flushed before it is being used. The next series should probably make GetTempFile() buffer writes by default.
* Merge branch 'pu/dead-pin' into 'master'Julian Andres Klode2019-02-042-0/+48
|\ | | | | | | | | A pin of -32768 overrides any other, disables repo See merge request apt-team/apt!40
| * Add a Packages-Require-Authorization Release file fieldJulian Andres Klode2019-02-012-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new field allows a repository to declare that access to packages requires authorization. The current implementation will set the pin to -32768 if no authorization has been provided in the auth.conf(.d) files. This implementation is suboptimal in two aspects: (1) A repository should behave more like NotSource repositories (2) We only have the host name for the repository, we cannot use paths yet. - We can fix those after an ABI break. The code also adds a check to acquire-item.cc to not use the specified repository as a download source, mimicking NotSource.
* | Drop buffered writing from clearsigned message extractionDavid Kalnischkies2019-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It is dropped in the merged code, but the extraction of the clearsigned message code was the only one who had it previously, so the short-desc explains the change from a before-after merge of the branch PoV. It would make sense to enable it, but as we aren't in a time critical paths here we can delay this for after buster to avoid problems. References: 73e3459689c05cd62f15c29d2faddb0fc215ef5e Suggested-By: Julian Andres Klode
* | Avoid boolean flags by splitting writeTo functionsDavid Kalnischkies2019-02-011-14/+20
| | | | | | | | | | Suggested-By: Julian Andres Klode Gbp-Dch: Ignore
* | Reuse APT::StringView more in LineBufferDavid Kalnischkies2019-01-291-32/+9
| | | | | | | | | | | | | | No effective change in behaviour, just simplifying and reusing code. Suggested-By: Julian Andres Klode Gbp-Dch: Ignore
* | Rework ifs to use not instead of == false/trueDavid Kalnischkies2019-01-291-54/+66
| | | | | | | | | | | | | | | | No change in the logic itself, just dropping "== true", replacing "== false" with not and moving lines around to make branches more obvious. Suggested-By: Julian Andres Klode Gbp-Dch: Ignore
* | Refuse files with lines unexpectedly starting with a dashDavid Kalnischkies2019-01-281-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We support dash-encoding even if we don't really work with files who would need it as implementations are free to encode every line, but otherwise a line starting with a dash must either be a header we parse explicitly or the file is refused. This is against the RFC which says clients should warn on such files, but given that we aren't expecting any files with dash-started lines to begin with this looks a lot like a we should not continue to touch the file as it smells like an attempt to confuse different parsers by "hiding" headers in-between others. The other slightly more reasonable explanation would be an armor header key starting with a dash, but no existing key does that and it seems unlikely that this could ever happen. Also, it is recommended that clients warn about unknown keys, so new appearance is limited.
* | Use more abstraction to handle the current line bufferDavid Kalnischkies2019-01-281-83/+133
| | | | | | | | | | | | | | This is C++, so we can use a bit more abstraction to let the code look a tiny bit nicer hopefully improving readability a bit. Gbp-Dch: Ignore
* | Explicitly remove the whitespaces defined by RFCDavid Kalnischkies2019-01-281-4/+20
| | | | | | | | | | | | | | | | | | | | RFC 4880 section 7.1 "Dash-Escaped Text" at the end defines that only space and tab are allowed, so we should remove only these even if due to use complaining (or now failing) you can't really make use of it. Note that strrstrip was removing '\r\n\t ', not other whitespaces like \v or \f and another big reason to do it explicitly here now is to avoid that a future change adding those could have unintended consequences.
* | Merge and reuse tmp file handling across the boardDavid Kalnischkies2019-01-242-55/+29
| | | | | | | | | | | | Having many rather similar implementations especially if one is exported while others aren't (and the rest of it not factored out at all) seems suboptimal.
* | Fail on non-signature lines in Release.gpgDavid Kalnischkies2019-01-231-20/+64
| | | | | | | | | | | | | | | | | | | | The exploit for CVE-2019-3462 uses the fact that a Release.gpg file can contain additional content beside the expected detached signature(s). We were passing the file unchecked to gpgv which ignores these extras without complains, so we reuse the same line-reading implementation we use for InRelease splitting to detect if a Release.gpg file contains unexpected data and fail in this case given that we in the previous commit we established that we fail in the similar InRelease case now.
* | Fail instead of warn for unsigned lines in InReleaseDavid Kalnischkies2019-01-231-106/+99
|/ | | | | | | | | | | | The warnings were introduced 2 years ago without any reports from the wild about them actually appearing for anyone, so now seems to be an as good time as any to switch them to errors. This allows rewritting the code by failing earlier instead of trying to keep going which makes the diff a bit hard to follow but should help simplifying reasoning about it. References: 6376dfb8dfb99b9d182c2fb13aa34b2ac89805e3
* Remove `register` keywordKhem Raj2019-01-221-1/+1
| | | | | | | | | | | | | | | | | | In C++17 `register` keyword was removed. Current gcc 8.1.0 produces following warning if `-std=c++17` flag is used: warning: ISO C++17 does not allow 'register' storage class specifier [-Wregister] GCC almost completely ignores `register` keyword, with rare exception of `-O0` when additional copy from/to stack may be generated. For simplicity of the codebase it is better to just remove this problematic keyword where it is not strictly required. See: http://en.cppreference.com/w/cpp/language/storage_duration Signed-off-by: Khem Raj <raj.khem@gmail.com>
* configuration: Compare size first during lookupJulian Andres Klode2018-12-261-1/+1
|
* Override FileFd copy constructor to prevent copyingJulian Andres Klode2018-12-041-0/+1
| | | | | FileFd could be copied using the default copy constructor, which does not work, and then causes code to crash.
* Use quoted tagnames in config dumpsDavid Kalnischkies2018-11-291-1/+1
| | | | | | | | | | | | | | Tagnames in configuration can include spaces (and other nasties) e.g. in repository-specific configuration options due to Origin/Label potentially containing a space. The configuration file format supports parsing quoted as well as encoded spaces, but the output generated by apt-config and other places which might be feedback into apt via parsing (e.g. before calling apt-key in our gpgv method) do not quote and hence produce invalid configuration files. Changing the default to be an encoded tagname ensures that the output of dump can be used as a config file, but other users might not expect this so that is technically a backward-breaking change.
* Fix typo reported by codespell in code commentsDavid Kalnischkies2018-11-252-2/+2
| | | | | | | | No user visible change expect for some years old changelog entries, so we don't really need to add a new one for this… Reported-By: codespell Gbp-Dch: Ignore
* Merge branch 'feature/subkeys' into 'master'Julian Andres Klode2018-10-141-4/+7
|\ | | | | | | | | Support subkeys and multiple keyrings in Signed-By options See merge request apt-team/apt!27
| * Support multiple keyrings in sources.list Signed-ByDavid Kalnischkies2018-09-111-4/+7
| | | | | | | | | | | | | | A user can specify multiple fingerprints for a while now, so its seems counter-intuitive to support only one keyring, especially if this isn't really checked or enforced and while unlikely mixtures of both should work properly, too, instead of a kinda random behaviour.