Loading maintainers/scripts/sha-to-sri.py +37 −31 Original line number Diff line number Diff line Loading @@ -26,10 +26,11 @@ class Encoding(ABC): assert len(digest) == self.n from base64 import b64encode return f"{self.hashName}-{b64encode(digest).decode()}" @classmethod def all(cls, h) -> 'List[Encoding]': def all(cls, h) -> "List[Encoding]": return [c(h) for c in cls.__subclasses__()] def __init__(self, h): Loading @@ -38,16 +39,14 @@ class Encoding(ABC): @property @abstractmethod def length(self) -> int: ... def length(self) -> int: ... @property def regex(self) -> str: return f"[{self.alphabet}]{{{self.length}}}" @abstractmethod def decode(self, s: str) -> bytes: ... def decode(self, s: str) -> bytes: ... class Nix32(Encoding): Loading @@ -57,6 +56,7 @@ class Nix32(Encoding): @property def length(self): return 1 + (8 * self.n) // 5 def decode(self, s: str): assert len(s) == self.length out = [0 for _ in range(self.n)] Loading @@ -65,7 +65,7 @@ class Nix32(Encoding): for n, c in enumerate(reversed(s)): digit = self.inverted[c] i, j = divmod(5 * n, 8) out[i] = out[i] | (digit << j) & 0xff out[i] = out[i] | (digit << j) & 0xFF rem = digit >> (8 - j) if rem == 0: continue Loading @@ -76,16 +76,20 @@ class Nix32(Encoding): return bytes(out) class Hex(Encoding): alphabet = "0-9A-Fa-f" @property def length(self): return 2 * self.n def decode(self, s: str): from binascii import unhexlify return unhexlify(s) class Base64(Encoding): alphabet = "A-Za-z0-9+/" Loading @@ -94,36 +98,39 @@ class Base64(Encoding): """Number of characters in data and padding.""" i, k = divmod(self.n, 3) return 4 * i + (0 if k == 0 else k + 1), (3 - k) % 3 @property def length(self): return sum(self.format) @property def regex(self): data, padding = self.format return f"[{self.alphabet}]{{{data}}}={{{padding}}}" def decode(self, s): from base64 import b64decode return b64decode(s, validate = True) _HASHES = (hashlib.new(n) for n in ('SHA-256', 'SHA-512')) ENCODINGS = { h.name: Encoding.all(h) for h in _HASHES } _HASHES = (hashlib.new(n) for n in ("SHA-256", "SHA-512")) ENCODINGS = {h.name: Encoding.all(h) for h in _HASHES} RE = { h: "|".join( (f"({h}-)?" if e.name == 'base64' else '') + f"(?P<{h}_{e.name}>{e.regex})" (f"({h}-)?" if e.name == "base64" else "") + f"(?P<{h}_{e.name}>{e.regex})" for e in encodings ) for h, encodings in ENCODINGS.items() ) for h, encodings in ENCODINGS.items() } _DEF_RE = re.compile("|".join( _DEF_RE = re.compile( "|".join( f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)" for h, re in RE.items() )) ) ) def defToSRI(s: str) -> str: Loading Loading @@ -153,7 +160,7 @@ def defToSRI(s: str) -> str: @contextmanager def atomicFileUpdate(target: Path): '''Atomically replace the contents of a file. """Atomically replace the contents of a file. Guarantees that no temporary files are left behind, and `target` is either left untouched, or overwritten with new content if no exception was raised. Loading @@ -164,9 +171,10 @@ def atomicFileUpdate(target: Path): Upon exiting the context, the files are closed; if no exception was raised, `new` (atomically) replaces the `target`, otherwise it is deleted. ''' """ # That's mostly copied from noto-emoji.py, should DRY it out from tempfile import mkstemp fd, _p = mkstemp( dir = target.parent, prefix = target.name, Loading @@ -175,7 +183,7 @@ def atomicFileUpdate(target: Path): try: with target.open() as original: with tmpPath.open('w') as new: with tmpPath.open("w") as new: yield (original, new) tmpPath.replace(target) Loading @@ -192,13 +200,11 @@ def fileToSRI(p: Path): new.write(defToSRI(line)) _SKIP_RE = re.compile( "(generated by)|(do not edit)", re.IGNORECASE ) _SKIP_RE = re.compile("(generated by)|(do not edit)", re.IGNORECASE) if __name__ == "__main__": from sys import argv, stderr logger.info("Starting!") for arg in argv[1:]: Loading Loading
maintainers/scripts/sha-to-sri.py +37 −31 Original line number Diff line number Diff line Loading @@ -26,10 +26,11 @@ class Encoding(ABC): assert len(digest) == self.n from base64 import b64encode return f"{self.hashName}-{b64encode(digest).decode()}" @classmethod def all(cls, h) -> 'List[Encoding]': def all(cls, h) -> "List[Encoding]": return [c(h) for c in cls.__subclasses__()] def __init__(self, h): Loading @@ -38,16 +39,14 @@ class Encoding(ABC): @property @abstractmethod def length(self) -> int: ... def length(self) -> int: ... @property def regex(self) -> str: return f"[{self.alphabet}]{{{self.length}}}" @abstractmethod def decode(self, s: str) -> bytes: ... def decode(self, s: str) -> bytes: ... class Nix32(Encoding): Loading @@ -57,6 +56,7 @@ class Nix32(Encoding): @property def length(self): return 1 + (8 * self.n) // 5 def decode(self, s: str): assert len(s) == self.length out = [0 for _ in range(self.n)] Loading @@ -65,7 +65,7 @@ class Nix32(Encoding): for n, c in enumerate(reversed(s)): digit = self.inverted[c] i, j = divmod(5 * n, 8) out[i] = out[i] | (digit << j) & 0xff out[i] = out[i] | (digit << j) & 0xFF rem = digit >> (8 - j) if rem == 0: continue Loading @@ -76,16 +76,20 @@ class Nix32(Encoding): return bytes(out) class Hex(Encoding): alphabet = "0-9A-Fa-f" @property def length(self): return 2 * self.n def decode(self, s: str): from binascii import unhexlify return unhexlify(s) class Base64(Encoding): alphabet = "A-Za-z0-9+/" Loading @@ -94,36 +98,39 @@ class Base64(Encoding): """Number of characters in data and padding.""" i, k = divmod(self.n, 3) return 4 * i + (0 if k == 0 else k + 1), (3 - k) % 3 @property def length(self): return sum(self.format) @property def regex(self): data, padding = self.format return f"[{self.alphabet}]{{{data}}}={{{padding}}}" def decode(self, s): from base64 import b64decode return b64decode(s, validate = True) _HASHES = (hashlib.new(n) for n in ('SHA-256', 'SHA-512')) ENCODINGS = { h.name: Encoding.all(h) for h in _HASHES } _HASHES = (hashlib.new(n) for n in ("SHA-256", "SHA-512")) ENCODINGS = {h.name: Encoding.all(h) for h in _HASHES} RE = { h: "|".join( (f"({h}-)?" if e.name == 'base64' else '') + f"(?P<{h}_{e.name}>{e.regex})" (f"({h}-)?" if e.name == "base64" else "") + f"(?P<{h}_{e.name}>{e.regex})" for e in encodings ) for h, encodings in ENCODINGS.items() ) for h, encodings in ENCODINGS.items() } _DEF_RE = re.compile("|".join( _DEF_RE = re.compile( "|".join( f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)" for h, re in RE.items() )) ) ) def defToSRI(s: str) -> str: Loading Loading @@ -153,7 +160,7 @@ def defToSRI(s: str) -> str: @contextmanager def atomicFileUpdate(target: Path): '''Atomically replace the contents of a file. """Atomically replace the contents of a file. Guarantees that no temporary files are left behind, and `target` is either left untouched, or overwritten with new content if no exception was raised. Loading @@ -164,9 +171,10 @@ def atomicFileUpdate(target: Path): Upon exiting the context, the files are closed; if no exception was raised, `new` (atomically) replaces the `target`, otherwise it is deleted. ''' """ # That's mostly copied from noto-emoji.py, should DRY it out from tempfile import mkstemp fd, _p = mkstemp( dir = target.parent, prefix = target.name, Loading @@ -175,7 +183,7 @@ def atomicFileUpdate(target: Path): try: with target.open() as original: with tmpPath.open('w') as new: with tmpPath.open("w") as new: yield (original, new) tmpPath.replace(target) Loading @@ -192,13 +200,11 @@ def fileToSRI(p: Path): new.write(defToSRI(line)) _SKIP_RE = re.compile( "(generated by)|(do not edit)", re.IGNORECASE ) _SKIP_RE = re.compile("(generated by)|(do not edit)", re.IGNORECASE) if __name__ == "__main__": from sys import argv, stderr logger.info("Starting!") for arg in argv[1:]: Loading