| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Closes: issue #855269.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We used to create a dotlock file first and then lock with fcntl; swap that
order, since locking first with fcntl seems to be more common.
This patch also adds general mbox lock/unlock methods, which call the
dotlock and fcntl-lock methods, and moves the retry logic there.
When the dotlock and fcntl methods fail to acquire a lock, they now raise
a custom exception "LockUnavailable", which gets caught in the general
lock() method. That way, if we succeed to acquire one lock but fail to
acquire the other, we can release our locks at the upper level and retry.
|
|
|
|
| |
flock() locks aren't portable; lockf() locks are.
|
|
|
|
|
| |
An entirely cosmetic variable rename, but it's just not correct to call
this a "procmail lock". Also reword some comments accordingly.
|
|
|
|
|
|
|
|
| |
These helper methods provide success verification after test archiving runs, and
test case setup. This is a tradeoff: because these methods need to support all
scenarios in one place, they introduce some new complexity - but they replace a
lot of tedious, very similar, but still not entirely identical code all over the
place.
|
|
|
|
|
| |
Don't do entire test archiving runs, just call
archivemail.should_archive().
|
|
|
|
|
| |
Don't do entire test archiving runs, just call
archivemail.should_archive().
|
|
|
|
|
|
| |
TestArchiveMboxPreserveStatus actually doesn't test that the message
status is preserved, but that the --preserve-unread option works.
Rename it to TestArchiveMboxPreserveUnread.
|
|
|
|
|
| |
Don't do entire test archiving runs, just call
archivemail.should_archive().
|
|
|
|
|
| |
Don't do entire test archiving runs, just call
archivemail.make_archive_name() and verify the result.
|
|
|
|
|
| |
Don't do entire test archiving runs, just call
archivemail.should_archive().
|
| |
|
|
|
|
|
| |
Don't do entire test archiving runs, just call
archivemail.make_archive_name() and verify the result.
|
|
|
|
| |
Before, every test header was tested in a separate archiving run.
|
|
|
|
|
| |
Don't do entire test archiving runs, just call
archivemail.should_archive().
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
The test suite used to run a lot of triple tests, by first calling
archivemail.archive() directly, and then running the entire archivemail
script twice, once with long and once with short options. But we already
test option processing seperately, and beyond that, archivemail.main()
essentially just calls archive() for each mailbox in turn. So we just drop
all runs of the entire archivemail script from the test suite, giving it a
huge speed boost (on my old iBook, running the test suite drops from 73 to
5 seconds).
|
| |
|
|
|
|
| |
Use gzip.GzipFile instead.
|
|
|
|
|
| |
This eliminates a lot of copy-and-paste code, and switches from
os.system("gzip <...>") to gzip.GzipFile.
|
|
|
|
|
|
|
| |
os.utime() uses the utimes(2) system call to set file timestamps. utimes(2)
has a microsecond resolution, but stat(2) may return timestamps with
nanosecond resolution. So, the check that we have properly reset the mbox
file timestamp must allow a minor deviation.
|
|
|
|
|
|
|
|
|
|
| |
* Make the finalise() methods spot if they have anything to do
* We used to create the temporary mbox files on demand in the message
processing loop, if we needed to write to them. Now we create them
beforehand, but only if they might be needed (e.g. we don't create an
archive if options.delete_old_mail is set).
* The above combined makes the final committing of the changes simpler (a
*lot* simpler for mboxes), and we can dump the Mbox.leave_empty() method.
|
|
|
|
|
| |
This separates write-only mbox access to the temporary mboxes from the read-only
access to the original mbox.
|
| |
|
|
|
|
|
|
| |
Updated documentation, and added a first simple unittest for this.
Closes: #1764846.
|
| |
|
| |
|
|
|
|
|
| |
bumped version to 0.7.1, and updated copyright.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
required.
|
|
|
|
|
|
|
| |
Should just serve as a last security fallback, since we operate in a safe
temporary directory and everything should be okay anyway, but that may be less
obvious. :-)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Derive all testcases that create temporary files from the new class
TestCaseInTempdir, which provides standard fixtures to set up a secure temporary
root directory for tempfiles and cleaning up afterwards. This also simplifies
the code.
This addresses Debian bug #385253, and reading the BTS log, it seems this issue
was assigned CVE-2006-4245, although I cannot find any further reference to that
CVE. Note that the bug was initially reported to affect archivemail itself,
too. This is not correct. There *are* race conditions with archivemail, but
they were not subject of that report, and are not that critical.
Also bumped python dependency to version 2.3 since we use tempfile.mkstemp() and
other recent stuff.
|
|
|
|
|
| |
testcase.
|
|
|
|
|
|
|
| |
matching tearDown() methods were already there.
We surely can move more (possibly duplicated) stuff into the setUp() methods
later.
|
|
|
|
|
| |
posix platforms only.
|
|
|
|
|
|
| |
fcntl(2) calls. fcntl locks don't support interlocking within a process, so we
need to fork() to correctly test them.
|
|
|
|
|
| |
Updated copyright notices in archivemail.py and test_archivemail.py.
|
|
|
|
|
|
| |
date directives in the suffix to the current date, but rev. 94 changed that to
the archive cut off date. Based on analysis by Peter Poeml. Thanks, Peter.
|
|
|
|
|
|
| |
older than the unix epoch. (New versions of python return OverFlow
error instead)
|
|
|
|
|
| |
tempfiles. This should be a lot more secure.
|
|
|
|
|
| |
with a completely blank value.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
short option, '-s' was).
Added time-based format directives to the --suffix option, so that you
can do things like specify --suffix='%B%Y' to create archives named
after the current month and year.
Added some more tests to test_archivemail.py
|
|
|
|
|
| |
2.2.
|
| |
|
|
|
|
|
|
| |
Hopefully I haven't gone too overboard with 957 lines of testing code for
a 1100 line program :)
|