Mercurial > p > roundup > code
view roundup/install_util.py @ 5548:fea11d05110e
Avoid errors from selecting "no selection" on multilink (issue2550722).
As discussed in issue 2550722 there are various cases where selecting
"no selection" on a multilink can result in inappropriate errors from
Roundup:
* If selecting "no selection" produces a null edit (a value was set in
the multilink in an edit with an error, then removed again, along
with all other changes, in the next form submission), so the page is
rendered from the form contents including the "-<id>" value for "no
selection" for the multilink.
* If creating an item with a nonempty value for a multilink has an
error, and the resubmission changes that multilink to "no selection"
(and this in turn has subcases, according to whether the creation
then succeeds or fails on the resubmission, which need fixes in
different places in the Roundup code).
All of these cases have in common that it is expected and OK to have a
"-<id>" value for a submission for a multilink when <id> is not set in
that multilink in the database (because the original attempt to set
<id> in that multilink had an error), so the hyperdb.py logic to give
an error in that case is thus removed. In the subcase of the second
case where the resubmission with "no selection" has an error, the
templating code tries to produce a menu entry for the "-<id>"
multilink value, which also results in an error, hence the
templating.py change to ignore such values in the list for a
multilink.
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Thu, 27 Sep 2018 11:33:01 +0000 |
| parents | 88cf5614e0f4 |
| children | 7ada5d44b21d |
line wrap: on
line source
# # Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/) # This module is free software, and you may redistribute it and/or modify # under the same terms as Python, so long as this copyright message and # disclaimer are retained in their original form. # # IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR # DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING # OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # # BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # """Support module to generate and check fingerprints of installed files. """ __docformat__ = 'restructuredtext' import os, shutil from hashlib import sha1 from roundup.anypy.strings import s2b sgml_file_types = [".xml", ".ent", ".html"] hash_file_types = [".py", ".sh", ".conf", ".cgi"] slast_file_types = [".css"] digested_file_types = sgml_file_types + hash_file_types + slast_file_types def extractFingerprint(lines): # get fingerprint from last line if lines[-1].startswith(b"#SHA: "): # handle .py/.sh comment return lines[-1][6:].strip() elif lines[-1].startswith(b"<!-- SHA: "): # handle xml/html files fingerprint = lines[-1][10:] fingerprint = fingerprint.replace(b'-->', b'') return fingerprint.strip() elif lines[-1].startswith(b"/* SHA: "): # handle css files fingerprint = lines[-1][8:] fingerprint = fingerprint.replace(b'*/', b'') return fingerprint.strip() return None def checkDigest(filename): """Read file, check for valid fingerprint, return TRUE if ok""" # open and read file inp = open(filename, "rb") lines = inp.readlines() inp.close() fingerprint = extractFingerprint(lines) if fingerprint is None: return 0 del lines[-1] # calculate current digest digest = sha1() for line in lines: digest.update(line) # compare current to stored digest return fingerprint == s2b(digest.hexdigest()) class DigestFile: """ A class that you can use like open() and that calculates and writes a SHA digest to the target file. """ def __init__(self, filename): self.filename = filename self.digest = sha1() self.file = open(self.filename, "wb") def write(self, data): lines = data.splitlines() # if the file is coming from an installed tracker being used as a # template, then we will want to re-calculate the SHA fingerprint = extractFingerprint(lines) if fingerprint is not None: data = b'\n'.join(lines[:-1]) + b'\n' self.file.write(data) self.digest.update(data) def close(self): file, ext = os.path.splitext(self.filename) if ext in sgml_file_types: self.file.write(s2b("<!-- SHA: %s -->\n" % (self.digest.hexdigest(),))) elif ext in hash_file_types: self.file.write(s2b("#SHA: %s\n" % (self.digest.hexdigest(),))) elif ext in slast_file_types: self.file.write(s2b("/* SHA: %s */\n" % (self.digest.hexdigest(),))) self.file.close() def copyDigestedFile(src, dst, copystat=1): """ Copy data from `src` to `dst`, adding a fingerprint to `dst`. If `copystat` is true, the file status is copied, too (like shutil.copy2). """ if os.path.isdir(dst): dst = os.path.join(dst, os.path.basename(src)) dummy, ext = os.path.splitext(src) if ext not in digested_file_types: if copystat: return shutil.copy2(src, dst) else: return shutil.copyfile(src, dst) fsrc = None fdst = None try: fsrc = open(src, 'rb') fdst = DigestFile(dst) shutil.copyfileobj(fsrc, fdst) finally: if fdst: fdst.close() if fsrc: fsrc.close() if copystat: shutil.copystat(src, dst) def test(): import sys testdata = open(sys.argv[0], 'rb').read() for ext in digested_file_types: testfile = "__digest_test" + ext out = DigestFile(testfile) out.write(testdata) out.close() assert checkDigest(testfile), "digest ok w/o modification" mod = open(testfile, 'r+b') mod.seek(0) mod.write('# changed!') mod.close() assert not checkDigest(testfile), "digest fails after modification" os.remove(testfile) if __name__ == '__main__': test() # vim: set filetype=python ts=4 sw=4 et si
