github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use MD5 usedforsecurity=False on Python 3.9 and higher to pass FIPS

Browse source 
Closes #2270
This commit is contained in:
Simon Willison 2024-02-13 18:23:54 -08:00 • committed by GitHub
commit b89cac3b6a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
datasette/database.py
View file

@ -1,7 +1,6 @@
import asyncio import asyncio
from collections import namedtuple from collections import namedtuple
from pathlib import Path from pathlib import Path
import hashlib
import janus import janus
import queue import queue
import sys import sys
@ -15,6 +14,7 @@ from .utils import (
detect_spatialite, detect_spatialite,
get_all_foreign_keys, get_all_foreign_keys,
get_outbound_foreign_keys, get_outbound_foreign_keys,
md5_not_usedforsecurity,
sqlite_timelimit, sqlite_timelimit,
sqlite3, sqlite3,
table_columns, table_columns,
@ -74,7 +74,7 @@ class Database:
def color(self): def color(self):
if self.hash: if self.hash:
return self.hash[:6] return self.hash[:6]
return hashlib.md5(self.name.encode("utf8")).hexdigest()[:6] return md5_not_usedforsecurity(self.name)[:6]
def suggest_name(self): def suggest_name(self):
if self.path: if self.path:

10
datasette/utils/__init__.py
View file

@ -713,7 +713,7 @@ def to_css_class(s):
""" """
if css_class_re.match(s): if css_class_re.match(s):
return s return s
md5_suffix = hashlib.md5(s.encode("utf8")).hexdigest()[:6] md5_suffix = md5_not_usedforsecurity(s)[:6]
# Strip leading _, - # Strip leading _, -
s = s.lstrip("_").lstrip("-") s = s.lstrip("_").lstrip("-")
# Replace any whitespace with hyphens # Replace any whitespace with hyphens
@ -1401,3 +1401,11 @@ def redact_keys(original: dict, key_patterns: Iterable) -> dict:
return data return data
return redact(original) return redact(original)
def md5_not_usedforsecurity(s):
try:
return hashlib.md5(s.encode("utf8"), usedforsecurity=False).hexdigest()
except TypeError:
# For Python 3.8 which does not support usedforsecurity=False
return hashlib.md5(s.encode("utf8")).hexdigest()