Generate integrity hash for scripts/link tags on the index.#442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
T4rk1n wants to merge 10 commits into from
Closed

Generate integrity hash for scripts/link tags on the index. #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6b56ebb
Add integrity hash utils functions.
T4rk1n Oct 30, 2018
fe0b6bb
Add integrity hash to generated script/link tags.
T4rk1n Oct 30, 2018
e8146f1
pylint fix.
T4rk1n Oct 30, 2018
ef94ab4
Use a custom memoize instead of lru_cache for py2 support.
T4rk1n Oct 30, 2018
027d709
Fix line length & disable old-style-class globally.
T4rk1n Oct 30, 2018
aec70fb
:camel: integrity hash generation.
T4rk1n Oct 31, 2018
e07ed47
Find local file for unpkg url.
T4rk1n Oct 31, 2018
222533b
pylint fixes
T4rk1n Oct 31, 2018
ee9c1d7
Fix link that already got an href value.
T4rk1n Oct 31, 2018
d45b209
Fix memoize kwargs.
T4rk1n Nov 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .pylintrc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ confidence=
disable=fixme,
missing-docstring,
invalid-name,
too-many-lines
too-many-lines,
old-style-class
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down
52 changes: 52 additions & 0 deletions dash/_utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
import functools
import hashlib
import base64
import pkgutil


def memoize(func):
results = {}

@functools.wraps(func)
def wrapper(*args, **kwargs):
key = hash((args, frozenset(kwargs.items())))
cached = results.get(key)
if cached:
return cached
results[key] = r = func(*args, **kwargs)
return r

return wrapper


def interpolate_str(template, **data):
s = template
for k, v in data.items():
Expand DownExpand Up@@ -37,6 +58,37 @@ def get_asset_path(
])


def pluck(obj, *props, **additions):
return dict({k: v for k, v in obj.items() if k in props}, **additions)


def first_key(data, *keys):
for key in keys:
value = data.get(key)
if value:
return key, value
return None, None


def _integrity_hash(b):
h = hashlib.sha384(b)

return 'sha384-{}'.format(
base64.b64encode(h.digest()).decode()
)


@memoize
def integrity_hash_from_file(filename):
with open(filename, 'rb') as f:
return _integrity_hash(f.read())


@memoize
def integrity_hash_from_package(namespace, path):
return _integrity_hash(pkgutil.get_data(namespace, path))


class AttributeDict(dict):
"""
Dictionary subclass enabling attribute lookup/assignment of keys/values.
Expand Down
56 changes: 46 additions & 10 deletions dash/dash.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
from ._utils import interpolate_str as _interpolate
from ._utils import format_tag as _format_tag
from ._utils import get_asset_path as _get_asset_path
from ._utils import pluck as _pluck
from . import _configs


Expand DownExpand Up@@ -313,6 +314,7 @@ def _collect_and_register_resources(self, resources):
def _relative_url_path(relative_package_path='', namespace=''):

# track the registered packages
# FIXME it append a new path each time the index is served ?
if namespace in self.registered_paths:
self.registered_paths[namespace].append(relative_package_path)
else:
Expand All@@ -332,23 +334,34 @@ def _relative_url_path(relative_package_path='', namespace=''):
modified
)

def pack(src, **kwargs):
return dict(kwargs, src=src)

srcs = []
for resource in resources:
if 'relative_package_path' in resource:
if isinstance(resource['relative_package_path'], str):
srcs.append(_relative_url_path(**resource))
srcs.append(
pack(
_relative_url_path(
resource['relative_package_path'],
resource['namespace']),
**resource)
)
else:
for rel_path in resource['relative_package_path']:
srcs.append(_relative_url_path(
srcs.append(pack(_relative_url_path(
relative_package_path=rel_path,
namespace=resource['namespace']
))
namespace=resource['namespace'],
), **resource))
elif 'external_url' in resource:
if isinstance(resource['external_url'], str):
srcs.append(resource['external_url'])
srcs.append(
pack(resource['external_url'], **resource)
)
else:
for url in resource['external_url']:
srcs.append(url)
srcs.append(pack(url))
elif 'absolute_path' in resource:
raise Exception(
'Serving files from absolute_path isn\'t supported yet'
Expand All@@ -357,15 +370,30 @@ def _relative_url_path(relative_package_path='', namespace=''):
static_url = self.get_asset_url(resource['asset_path'])
# Add a bust query param
static_url += '?m={}'.format(resource['ts'])
srcs.append(static_url)
srcs.append(pack(static_url, **resource))
return srcs

def _generate_css_dist_html(self):
links = self._external_stylesheets + \
self._collect_and_register_resources(self.css.get_all_css())

return '\n'.join([
_format_tag('link', link, opened=True)
_format_tag(
'link',
_pluck(
link,
'integrity',
'crossorigin',
'media',
'charset',
'rev',
'target',
'type',
href=link.get('src', link.get('href')),
rel='stylesheet'
),
opened=True
)
if isinstance(link, dict)
else '<link rel="stylesheet" href="{}">'.format(link)
for link in links
Expand All@@ -392,7 +420,15 @@ def _generate_scripts_html(self):
))

return '\n'.join([
_format_tag('script', src)
_format_tag('script', _pluck(
src,
'src',
'integrity',
'crossorigin',
'charset',
'async',
'defer',
'type'))
if isinstance(src, dict)
else '<script src="{}"></script>'.format(src)
for src in srcs
Expand DownExpand Up@@ -492,7 +528,7 @@ def index(self, *args, **kwargs): # pylint: disable=unused-argument
checks = (
(_re_index_entry_id.search(index), '#react-entry-point'),
(_re_index_config_id.search(index), '#_dash-configs'),
(_re_index_scripts_id.search(index), 'dash-renderer'),
# (_re_index_scripts_id.search(index), 'dash-renderer'),
)
missing = [missing for check, missing in checks if not check]

Expand Down
63 changes: 62 additions & 1 deletion dash/resources.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,27 @@
import os

from .development.base_component import Component
from ._utils import \
first_key, integrity_hash_from_file, integrity_hash_from_package


# pylint: disable=inconsistent-return-statements
def find_unpkg(value, relative_package_paths):
# find the local file for a unpkg url.
# The structure of the _js_dist/_css_dist does not allow
# for easy translation between local and external dependencies.
v = value.replace('https://unpkg.com/', '')
s = v.split('/')
lib, version = s[0].split('@')
filename = s[-1]
ext = filename.split('.')[-1]

for i in relative_package_paths:
if (i == filename and i not in [
'index.js', 'index.css', 'style.css', 'style.min.css',
'styles.css', 'styles.min.css']) \
or (lib in i and version in i and i.endswith(ext)):
return i


# pylint: disable=old-style-class
Expand All@@ -16,14 +37,17 @@ def __init__(self, resource_name, layout):
def append_resource(self, resource):
self._resources.append(resource)

# pylint: disable=too-many-branches
def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resources = []
for s in all_resources:
filtered_resource = {}
added = False
if 'namespace' in s:
filtered_resource['namespace'] = s['namespace']
if 'external_url' in s and not self.config.serve_locally:
filtered_resource['external_url'] = s['external_url']
filtered_resource['local_file'] = s['relative_package_path']
elif 'dev_package_path' in s and dev_bundles:
filtered_resource['relative_package_path'] = (
s['dev_package_path']
Expand All@@ -36,6 +60,9 @@ def _filter_resources(self, all_resources, dev_bundles=False):
filtered_resource['absolute_path'] = s['absolute_path']
elif 'asset_path' in s:
info = os.stat(s['filepath'])
filtered_resource['integrity'] = integrity_hash_from_file(
s['filepath'])
filtered_resource['crossorigin'] = 'anonymous'
filtered_resource['asset_path'] = s['asset_path']
filtered_resource['ts'] = info.st_mtime
elif self.config.serve_locally:
Expand All@@ -54,7 +81,41 @@ def _filter_resources(self, all_resources, dev_bundles=False):
)
)

filtered_resources.append(filtered_resource)
if 'integrity' not in filtered_resource \
and 'namespace' in filtered_resource:
key, filename = first_key(
filtered_resource,
'external_url',
'dev_package_path',
'relative_package_path'
)
if isinstance(filename, list):
# flatten these dependencies and add a hash for each.
for f in filename:
local_file = filtered_resource.get('local_file')
filename = find_unpkg(f, local_file) \
if local_file else f.split('/')[-1]
filtered_resources.append({
key: f,
'integrity': integrity_hash_from_package(
filtered_resource['namespace'],
filename),
'crossorigin': 'anonymous',
'namespace': filtered_resource['namespace']
})
added = True
else:
filename = filtered_resource.get(
'local_file', filename.split('/')[-1])
filtered_resource['integrity'] = \
integrity_hash_from_package(
filtered_resource['namespace'],
filename
)
filtered_resource['crossorigin'] = 'anonymous'

if not added:
filtered_resources.append(filtered_resource)

return filtered_resources

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Generate integrity hash for scripts/link tags on the index.#442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

T4rk1n
wants to merge
10
commits into

from

 Closed


Generate integrity hash for scripts/link tags on the index.
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6b56ebb

Add integrity hash utils functions.


T4rk1n Oct 30, 2018
fe0b6bb

Add integrity hash to generated script/link tags.


T4rk1n Oct 30, 2018
e8146f1

pylint fix.


T4rk1n Oct 30, 2018
ef94ab4

Use a custom memoize instead of lru_cache for py2 support.


T4rk1n Oct 30, 2018
027d709

Fix line length & disable old-style-class globally.


T4rk1n Oct 30, 2018
aec70fb

:camel: integrity hash generation.


T4rk1n Oct 31, 2018
e07ed47

Find local file for unpkg url.


T4rk1n Oct 31, 2018
222533b

pylint fixes


T4rk1n Oct 31, 2018
ee9c1d7

Fix link that already got an href value.


T4rk1n Oct 31, 2018
d45b209

Fix memoize kwargs.


T4rk1n Nov 5, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ confidence=
disable=fixme,
 missing-docstring,
 invalid-name,
 too-many-lines
 too-many-lines,
 old-style-class
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down

52 changes: 52 additions & 0 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
import functools
import hashlib
import base64
import pkgutil


def memoize(func):
 results = {}

 @functools.wraps(func)
 def wrapper(*args, **kwargs):
 key = hash((args, frozenset(kwargs.items())))
 cached = results.get(key)
 if cached:
 return cached
 results[key] = r = func(*args, **kwargs)
 return r

 return wrapper


def interpolate_str(template, **data):
 s = template
 for k, v in data.items():
Expand DownExpand Up@@ -37,6 +58,37 @@ def get_asset_path(
 ])


def pluck(obj, *props, **additions):
 return dict({k: v for k, v in obj.items() if k in props}, **additions)


def first_key(data, *keys):
 for key in keys:
 value = data.get(key)
 if value:
 return key, value
 return None, None


def _integrity_hash(b):
 h = hashlib.sha384(b)

 return 'sha384-{}'.format(
 base64.b64encode(h.digest()).decode()
 )


@memoize
def integrity_hash_from_file(filename):
 with open(filename, 'rb') as f:
 return _integrity_hash(f.read())


@memoize
def integrity_hash_from_package(namespace, path):
 return _integrity_hash(pkgutil.get_data(namespace, path))


class AttributeDict(dict):
 """
 Dictionary subclass enabling attribute lookup/assignment of keys/values.
Expand Down

56 changes: 46 additions & 10 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
from ._utils import interpolate_str as _interpolate
from ._utils import format_tag as _format_tag
from ._utils import get_asset_path as _get_asset_path
from ._utils import pluck as _pluck
from . import _configs


Expand DownExpand Up@@ -313,6 +314,7 @@ def _collect_and_register_resources(self, resources):
 def _relative_url_path(relative_package_path='', namespace=''):

 # track the registered packages
 # FIXME it append a new path each time the index is served ?
 if namespace in self.registered_paths:
 self.registered_paths[namespace].append(relative_package_path)
 else:
Expand All@@ -332,23 +334,34 @@ def _relative_url_path(relative_package_path='', namespace=''):
 modified
 )

 def pack(src, **kwargs):
 return dict(kwargs, src=src)

 srcs = []
 for resource in resources:
 if 'relative_package_path' in resource:
 if isinstance(resource['relative_package_path'], str):
 srcs.append(_relative_url_path(**resource))
 srcs.append(
 pack(
 _relative_url_path(
 resource['relative_package_path'],
 resource['namespace']),
 **resource)
 )
 else:
 for rel_path in resource['relative_package_path']:
 srcs.append(_relative_url_path(
 srcs.append(pack(_relative_url_path(
 relative_package_path=rel_path,
 namespace=resource['namespace']
 ))
 namespace=resource['namespace'],
 ), **resource))
 elif 'external_url' in resource:
 if isinstance(resource['external_url'], str):
 srcs.append(resource['external_url'])
 srcs.append(
 pack(resource['external_url'], **resource)
 )
 else:
 for url in resource['external_url']:
 srcs.append(url)
 srcs.append(pack(url))
 elif 'absolute_path' in resource:
 raise Exception(
 'Serving files from absolute_path isn\'t supported yet'
Expand All@@ -357,15 +370,30 @@ def _relative_url_path(relative_package_path='', namespace=''):
 static_url = self.get_asset_url(resource['asset_path'])
 # Add a bust query param
 static_url += '?m={}'.format(resource['ts'])
 srcs.append(static_url)
 srcs.append(pack(static_url, **resource))
 return srcs

 def _generate_css_dist_html(self):
 links = self._external_stylesheets + \
 self._collect_and_register_resources(self.css.get_all_css())

 return '\n'.join([
 _format_tag('link', link, opened=True)
 _format_tag(
 'link',
 _pluck(
 link,
 'integrity',
 'crossorigin',
 'media',
 'charset',
 'rev',
 'target',
 'type',
 href=link.get('src', link.get('href')),
 rel='stylesheet'
 ),
 opened=True
 )
 if isinstance(link, dict)
 else '<link rel="stylesheet" href="{}">'.format(link)
 for link in links
Expand All@@ -392,7 +420,15 @@ def _generate_scripts_html(self):
 ))

 return '\n'.join([
 _format_tag('script', src)
 _format_tag('script', _pluck(
 src,
 'src',
 'integrity',
 'crossorigin',
 'charset',
 'async',
 'defer',
 'type'))
 if isinstance(src, dict)
 else '<script src="{}"></script>'.format(src)
 for src in srcs
Expand DownExpand Up@@ -492,7 +528,7 @@ def index(self, *args, **kwargs): # pylint: disable=unused-argument
 checks = (
 (_re_index_entry_id.search(index), '#react-entry-point'),
 (_re_index_config_id.search(index), '#_dash-configs'),
 (_re_index_scripts_id.search(index), 'dash-renderer'),
# (_re_index_scripts_id.search(index), 'dash-renderer'),
 )
 missing = [missing for check, missing in checks if not check]

Expand Down

63 changes: 62 additions & 1 deletion
dash/resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,27 @@
import os

from .development.base_component import Component
from ._utils import \
 first_key, integrity_hash_from_file, integrity_hash_from_package


# pylint: disable=inconsistent-return-statements
def find_unpkg(value, relative_package_paths):
 # find the local file for a unpkg url.
 # The structure of the _js_dist/_css_dist does not allow
 # for easy translation between local and external dependencies.
 v = value.replace('https://unpkg.com/', '')
 s = v.split('/')
 lib, version = s[0].split('@')
 filename = s[-1]
 ext = filename.split('.')[-1]

 for i in relative_package_paths:
 if (i == filename and i not in [
 'index.js', 'index.css', 'style.css', 'style.min.css',
 'styles.css', 'styles.min.css']) \
 or (lib in i and version in i and i.endswith(ext)):
 return i


# pylint: disable=old-style-class
Expand All@@ -16,14 +37,17 @@ def __init__(self, resource_name, layout):
 def append_resource(self, resource):
 self._resources.append(resource)

 # pylint: disable=too-many-branches
 def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resources = []
 for s in all_resources:
 filtered_resource = {}
 added = False
 if 'namespace' in s:
 filtered_resource['namespace'] = s['namespace']
 if 'external_url' in s and not self.config.serve_locally:
 filtered_resource['external_url'] = s['external_url']
 filtered_resource['local_file'] = s['relative_package_path']
 elif 'dev_package_path' in s and dev_bundles:
 filtered_resource['relative_package_path'] = (
 s['dev_package_path']
Expand All@@ -36,6 +60,9 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resource['absolute_path'] = s['absolute_path']
 elif 'asset_path' in s:
 info = os.stat(s['filepath'])
 filtered_resource['integrity'] = integrity_hash_from_file(
 s['filepath'])
 filtered_resource['crossorigin'] = 'anonymous'
 filtered_resource['asset_path'] = s['asset_path']
 filtered_resource['ts'] = info.st_mtime
 elif self.config.serve_locally:
Expand All@@ -54,7 +81,41 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 )
 )

 filtered_resources.append(filtered_resource)
 if 'integrity' not in filtered_resource \
 and 'namespace' in filtered_resource:
 key, filename = first_key(
 filtered_resource,
 'external_url',
 'dev_package_path',
 'relative_package_path'
 )
 if isinstance(filename, list):
 # flatten these dependencies and add a hash for each.
 for f in filename:
 local_file = filtered_resource.get('local_file')
 filename = find_unpkg(f, local_file) \
 if local_file else f.split('/')[-1]
 filtered_resources.append({
 key: f,
 'integrity': integrity_hash_from_package(
 filtered_resource['namespace'],
 filename),
 'crossorigin': 'anonymous',
 'namespace': filtered_resource['namespace']
 })
 added = True
 else:
 filename = filtered_resource.get(
 'local_file', filename.split('/')[-1])
 filtered_resource['integrity'] = \
 integrity_hash_from_package(
 filtered_resource['namespace'],
 filename
 )
 filtered_resource['crossorigin'] = 'anonymous'

 if not added:
 filtered_resources.append(filtered_resource)

 return filtered_resources

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Generate integrity hash for scripts/link tags on the index.#442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

T4rk1n
wants to merge
10
commits into

from

 Closed


Generate integrity hash for scripts/link tags on the index.
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6b56ebb

Add integrity hash utils functions.


T4rk1n Oct 30, 2018
fe0b6bb

Add integrity hash to generated script/link tags.


T4rk1n Oct 30, 2018
e8146f1

pylint fix.


T4rk1n Oct 30, 2018
ef94ab4

Use a custom memoize instead of lru_cache for py2 support.


T4rk1n Oct 30, 2018
027d709

Fix line length & disable old-style-class globally.


T4rk1n Oct 30, 2018
aec70fb

:camel: integrity hash generation.


T4rk1n Oct 31, 2018
e07ed47

Find local file for unpkg url.


T4rk1n Oct 31, 2018
222533b

pylint fixes


T4rk1n Oct 31, 2018
ee9c1d7

Fix link that already got an href value.


T4rk1n Oct 31, 2018
d45b209

Fix memoize kwargs.


T4rk1n Nov 5, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ confidence=
disable=fixme,
 missing-docstring,
 invalid-name,
 too-many-lines
 too-many-lines,
 old-style-class
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down

52 changes: 52 additions & 0 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
import functools
import hashlib
import base64
import pkgutil


def memoize(func):
 results = {}

 @functools.wraps(func)
 def wrapper(*args, **kwargs):
 key = hash((args, frozenset(kwargs.items())))
 cached = results.get(key)
 if cached:
 return cached
 results[key] = r = func(*args, **kwargs)
 return r

 return wrapper


def interpolate_str(template, **data):
 s = template
 for k, v in data.items():
Expand DownExpand Up@@ -37,6 +58,37 @@ def get_asset_path(
 ])


def pluck(obj, *props, **additions):
 return dict({k: v for k, v in obj.items() if k in props}, **additions)


def first_key(data, *keys):
 for key in keys:
 value = data.get(key)
 if value:
 return key, value
 return None, None


def _integrity_hash(b):
 h = hashlib.sha384(b)

 return 'sha384-{}'.format(
 base64.b64encode(h.digest()).decode()
 )


@memoize
def integrity_hash_from_file(filename):
 with open(filename, 'rb') as f:
 return _integrity_hash(f.read())


@memoize
def integrity_hash_from_package(namespace, path):
 return _integrity_hash(pkgutil.get_data(namespace, path))


class AttributeDict(dict):
 """
 Dictionary subclass enabling attribute lookup/assignment of keys/values.
Expand Down

56 changes: 46 additions & 10 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
from ._utils import interpolate_str as _interpolate
from ._utils import format_tag as _format_tag
from ._utils import get_asset_path as _get_asset_path
from ._utils import pluck as _pluck
from . import _configs


Expand DownExpand Up@@ -313,6 +314,7 @@ def _collect_and_register_resources(self, resources):
 def _relative_url_path(relative_package_path='', namespace=''):

 # track the registered packages
 # FIXME it append a new path each time the index is served ?
 if namespace in self.registered_paths:
 self.registered_paths[namespace].append(relative_package_path)
 else:
Expand All@@ -332,23 +334,34 @@ def _relative_url_path(relative_package_path='', namespace=''):
 modified
 )

 def pack(src, **kwargs):
 return dict(kwargs, src=src)

 srcs = []
 for resource in resources:
 if 'relative_package_path' in resource:
 if isinstance(resource['relative_package_path'], str):
 srcs.append(_relative_url_path(**resource))
 srcs.append(
 pack(
 _relative_url_path(
 resource['relative_package_path'],
 resource['namespace']),
 **resource)
 )
 else:
 for rel_path in resource['relative_package_path']:
 srcs.append(_relative_url_path(
 srcs.append(pack(_relative_url_path(
 relative_package_path=rel_path,
 namespace=resource['namespace']
 ))
 namespace=resource['namespace'],
 ), **resource))
 elif 'external_url' in resource:
 if isinstance(resource['external_url'], str):
 srcs.append(resource['external_url'])
 srcs.append(
 pack(resource['external_url'], **resource)
 )
 else:
 for url in resource['external_url']:
 srcs.append(url)
 srcs.append(pack(url))
 elif 'absolute_path' in resource:
 raise Exception(
 'Serving files from absolute_path isn\'t supported yet'
Expand All@@ -357,15 +370,30 @@ def _relative_url_path(relative_package_path='', namespace=''):
 static_url = self.get_asset_url(resource['asset_path'])
 # Add a bust query param
 static_url += '?m={}'.format(resource['ts'])
 srcs.append(static_url)
 srcs.append(pack(static_url, **resource))
 return srcs

 def _generate_css_dist_html(self):
 links = self._external_stylesheets + \
 self._collect_and_register_resources(self.css.get_all_css())

 return '\n'.join([
 _format_tag('link', link, opened=True)
 _format_tag(
 'link',
 _pluck(
 link,
 'integrity',
 'crossorigin',
 'media',
 'charset',
 'rev',
 'target',
 'type',
 href=link.get('src', link.get('href')),
 rel='stylesheet'
 ),
 opened=True
 )
 if isinstance(link, dict)
 else '<link rel="stylesheet" href="{}">'.format(link)
 for link in links
Expand All@@ -392,7 +420,15 @@ def _generate_scripts_html(self):
 ))

 return '\n'.join([
 _format_tag('script', src)
 _format_tag('script', _pluck(
 src,
 'src',
 'integrity',
 'crossorigin',
 'charset',
 'async',
 'defer',
 'type'))
 if isinstance(src, dict)
 else '<script src="{}"></script>'.format(src)
 for src in srcs
Expand DownExpand Up@@ -492,7 +528,7 @@ def index(self, *args, **kwargs): # pylint: disable=unused-argument
 checks = (
 (_re_index_entry_id.search(index), '#react-entry-point'),
 (_re_index_config_id.search(index), '#_dash-configs'),
 (_re_index_scripts_id.search(index), 'dash-renderer'),
# (_re_index_scripts_id.search(index), 'dash-renderer'),
 )
 missing = [missing for check, missing in checks if not check]

Expand Down

63 changes: 62 additions & 1 deletion
dash/resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,27 @@
import os

from .development.base_component import Component
from ._utils import \
 first_key, integrity_hash_from_file, integrity_hash_from_package


# pylint: disable=inconsistent-return-statements
def find_unpkg(value, relative_package_paths):
 # find the local file for a unpkg url.
 # The structure of the _js_dist/_css_dist does not allow
 # for easy translation between local and external dependencies.
 v = value.replace('https://unpkg.com/', '')
 s = v.split('/')
 lib, version = s[0].split('@')
 filename = s[-1]
 ext = filename.split('.')[-1]

 for i in relative_package_paths:
 if (i == filename and i not in [
 'index.js', 'index.css', 'style.css', 'style.min.css',
 'styles.css', 'styles.min.css']) \
 or (lib in i and version in i and i.endswith(ext)):
 return i


# pylint: disable=old-style-class
Expand All@@ -16,14 +37,17 @@ def __init__(self, resource_name, layout):
 def append_resource(self, resource):
 self._resources.append(resource)

 # pylint: disable=too-many-branches
 def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resources = []
 for s in all_resources:
 filtered_resource = {}
 added = False
 if 'namespace' in s:
 filtered_resource['namespace'] = s['namespace']
 if 'external_url' in s and not self.config.serve_locally:
 filtered_resource['external_url'] = s['external_url']
 filtered_resource['local_file'] = s['relative_package_path']
 elif 'dev_package_path' in s and dev_bundles:
 filtered_resource['relative_package_path'] = (
 s['dev_package_path']
Expand All@@ -36,6 +60,9 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resource['absolute_path'] = s['absolute_path']
 elif 'asset_path' in s:
 info = os.stat(s['filepath'])
 filtered_resource['integrity'] = integrity_hash_from_file(
 s['filepath'])
 filtered_resource['crossorigin'] = 'anonymous'
 filtered_resource['asset_path'] = s['asset_path']
 filtered_resource['ts'] = info.st_mtime
 elif self.config.serve_locally:
Expand All@@ -54,7 +81,41 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 )
 )

 filtered_resources.append(filtered_resource)
 if 'integrity' not in filtered_resource \
 and 'namespace' in filtered_resource:
 key, filename = first_key(
 filtered_resource,
 'external_url',
 'dev_package_path',
 'relative_package_path'
 )
 if isinstance(filename, list):
 # flatten these dependencies and add a hash for each.
 for f in filename:
 local_file = filtered_resource.get('local_file')
 filename = find_unpkg(f, local_file) \
 if local_file else f.split('/')[-1]
 filtered_resources.append({
 key: f,
 'integrity': integrity_hash_from_package(
 filtered_resource['namespace'],
 filename),
 'crossorigin': 'anonymous',
 'namespace': filtered_resource['namespace']
 })
 added = True
 else:
 filename = filtered_resource.get(
 'local_file', filename.split('/')[-1])
 filtered_resource['integrity'] = \
 integrity_hash_from_package(
 filtered_resource['namespace'],
 filename
 )
 filtered_resource['crossorigin'] = 'anonymous'

 if not added:
 filtered_resources.append(filtered_resource)

 return filtered_resources

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Generate integrity hash for scripts/link tags on the index.#442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

T4rk1n
wants to merge
10
commits into

from

 Closed


Generate integrity hash for scripts/link tags on the index.
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6b56ebb

Add integrity hash utils functions.


T4rk1n Oct 30, 2018
fe0b6bb

Add integrity hash to generated script/link tags.


T4rk1n Oct 30, 2018
e8146f1

pylint fix.


T4rk1n Oct 30, 2018
ef94ab4

Use a custom memoize instead of lru_cache for py2 support.


T4rk1n Oct 30, 2018
027d709

Fix line length & disable old-style-class globally.


T4rk1n Oct 30, 2018
aec70fb

:camel: integrity hash generation.


T4rk1n Oct 31, 2018
e07ed47

Find local file for unpkg url.


T4rk1n Oct 31, 2018
222533b

pylint fixes


T4rk1n Oct 31, 2018
ee9c1d7

Fix link that already got an href value.


T4rk1n Oct 31, 2018
d45b209

Fix memoize kwargs.


T4rk1n Nov 5, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ confidence=
disable=fixme,
 missing-docstring,
 invalid-name,
 too-many-lines
 too-many-lines,
 old-style-class
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down

52 changes: 52 additions & 0 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
import functools
import hashlib
import base64
import pkgutil


def memoize(func):
 results = {}

 @functools.wraps(func)
 def wrapper(*args, **kwargs):
 key = hash((args, frozenset(kwargs.items())))
 cached = results.get(key)
 if cached:
 return cached
 results[key] = r = func(*args, **kwargs)
 return r

 return wrapper


def interpolate_str(template, **data):
 s = template
 for k, v in data.items():
Expand DownExpand Up@@ -37,6 +58,37 @@ def get_asset_path(
 ])


def pluck(obj, *props, **additions):
 return dict({k: v for k, v in obj.items() if k in props}, **additions)


def first_key(data, *keys):
 for key in keys:
 value = data.get(key)
 if value:
 return key, value
 return None, None


def _integrity_hash(b):
 h = hashlib.sha384(b)

 return 'sha384-{}'.format(
 base64.b64encode(h.digest()).decode()
 )


@memoize
def integrity_hash_from_file(filename):
 with open(filename, 'rb') as f:
 return _integrity_hash(f.read())


@memoize
def integrity_hash_from_package(namespace, path):
 return _integrity_hash(pkgutil.get_data(namespace, path))


class AttributeDict(dict):
 """
 Dictionary subclass enabling attribute lookup/assignment of keys/values.
Expand Down

56 changes: 46 additions & 10 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
from ._utils import interpolate_str as _interpolate
from ._utils import format_tag as _format_tag
from ._utils import get_asset_path as _get_asset_path
from ._utils import pluck as _pluck
from . import _configs


Expand DownExpand Up@@ -313,6 +314,7 @@ def _collect_and_register_resources(self, resources):
 def _relative_url_path(relative_package_path='', namespace=''):

 # track the registered packages
 # FIXME it append a new path each time the index is served ?
 if namespace in self.registered_paths:
 self.registered_paths[namespace].append(relative_package_path)
 else:
Expand All@@ -332,23 +334,34 @@ def _relative_url_path(relative_package_path='', namespace=''):
 modified
 )

 def pack(src, **kwargs):
 return dict(kwargs, src=src)

 srcs = []
 for resource in resources:
 if 'relative_package_path' in resource:
 if isinstance(resource['relative_package_path'], str):
 srcs.append(_relative_url_path(**resource))
 srcs.append(
 pack(
 _relative_url_path(
 resource['relative_package_path'],
 resource['namespace']),
 **resource)
 )
 else:
 for rel_path in resource['relative_package_path']:
 srcs.append(_relative_url_path(
 srcs.append(pack(_relative_url_path(
 relative_package_path=rel_path,
 namespace=resource['namespace']
 ))
 namespace=resource['namespace'],
 ), **resource))
 elif 'external_url' in resource:
 if isinstance(resource['external_url'], str):
 srcs.append(resource['external_url'])
 srcs.append(
 pack(resource['external_url'], **resource)
 )
 else:
 for url in resource['external_url']:
 srcs.append(url)
 srcs.append(pack(url))
 elif 'absolute_path' in resource:
 raise Exception(
 'Serving files from absolute_path isn\'t supported yet'
Expand All@@ -357,15 +370,30 @@ def _relative_url_path(relative_package_path='', namespace=''):
 static_url = self.get_asset_url(resource['asset_path'])
 # Add a bust query param
 static_url += '?m={}'.format(resource['ts'])
 srcs.append(static_url)
 srcs.append(pack(static_url, **resource))
 return srcs

 def _generate_css_dist_html(self):
 links = self._external_stylesheets + \
 self._collect_and_register_resources(self.css.get_all_css())

 return '\n'.join([
 _format_tag('link', link, opened=True)
 _format_tag(
 'link',
 _pluck(
 link,
 'integrity',
 'crossorigin',
 'media',
 'charset',
 'rev',
 'target',
 'type',
 href=link.get('src', link.get('href')),
 rel='stylesheet'
 ),
 opened=True
 )
 if isinstance(link, dict)
 else '<link rel="stylesheet" href="{}">'.format(link)
 for link in links
Expand All@@ -392,7 +420,15 @@ def _generate_scripts_html(self):
 ))

 return '\n'.join([
 _format_tag('script', src)
 _format_tag('script', _pluck(
 src,
 'src',
 'integrity',
 'crossorigin',
 'charset',
 'async',
 'defer',
 'type'))
 if isinstance(src, dict)
 else '<script src="{}"></script>'.format(src)
 for src in srcs
Expand DownExpand Up@@ -492,7 +528,7 @@ def index(self, *args, **kwargs): # pylint: disable=unused-argument
 checks = (
 (_re_index_entry_id.search(index), '#react-entry-point'),
 (_re_index_config_id.search(index), '#_dash-configs'),
 (_re_index_scripts_id.search(index), 'dash-renderer'),
# (_re_index_scripts_id.search(index), 'dash-renderer'),
 )
 missing = [missing for check, missing in checks if not check]

Expand Down

63 changes: 62 additions & 1 deletion
dash/resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,27 @@
import os

from .development.base_component import Component
from ._utils import \
 first_key, integrity_hash_from_file, integrity_hash_from_package


# pylint: disable=inconsistent-return-statements
def find_unpkg(value, relative_package_paths):
 # find the local file for a unpkg url.
 # The structure of the _js_dist/_css_dist does not allow
 # for easy translation between local and external dependencies.
 v = value.replace('https://unpkg.com/', '')
 s = v.split('/')
 lib, version = s[0].split('@')
 filename = s[-1]
 ext = filename.split('.')[-1]

 for i in relative_package_paths:
 if (i == filename and i not in [
 'index.js', 'index.css', 'style.css', 'style.min.css',
 'styles.css', 'styles.min.css']) \
 or (lib in i and version in i and i.endswith(ext)):
 return i


# pylint: disable=old-style-class
Expand All@@ -16,14 +37,17 @@ def __init__(self, resource_name, layout):
 def append_resource(self, resource):
 self._resources.append(resource)

 # pylint: disable=too-many-branches
 def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resources = []
 for s in all_resources:
 filtered_resource = {}
 added = False
 if 'namespace' in s:
 filtered_resource['namespace'] = s['namespace']
 if 'external_url' in s and not self.config.serve_locally:
 filtered_resource['external_url'] = s['external_url']
 filtered_resource['local_file'] = s['relative_package_path']
 elif 'dev_package_path' in s and dev_bundles:
 filtered_resource['relative_package_path'] = (
 s['dev_package_path']
Expand All@@ -36,6 +60,9 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resource['absolute_path'] = s['absolute_path']
 elif 'asset_path' in s:
 info = os.stat(s['filepath'])
 filtered_resource['integrity'] = integrity_hash_from_file(
 s['filepath'])
 filtered_resource['crossorigin'] = 'anonymous'
 filtered_resource['asset_path'] = s['asset_path']
 filtered_resource['ts'] = info.st_mtime
 elif self.config.serve_locally:
Expand All@@ -54,7 +81,41 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 )
 )

 filtered_resources.append(filtered_resource)
 if 'integrity' not in filtered_resource \
 and 'namespace' in filtered_resource:
 key, filename = first_key(
 filtered_resource,
 'external_url',
 'dev_package_path',
 'relative_package_path'
 )
 if isinstance(filename, list):
 # flatten these dependencies and add a hash for each.
 for f in filename:
 local_file = filtered_resource.get('local_file')
 filename = find_unpkg(f, local_file) \
 if local_file else f.split('/')[-1]
 filtered_resources.append({
 key: f,
 'integrity': integrity_hash_from_package(
 filtered_resource['namespace'],
 filename),
 'crossorigin': 'anonymous',
 'namespace': filtered_resource['namespace']
 })
 added = True
 else:
 filename = filtered_resource.get(
 'local_file', filename.split('/')[-1])
 filtered_resource['integrity'] = \
 integrity_hash_from_package(
 filtered_resource['namespace'],
 filename
 )
 filtered_resource['crossorigin'] = 'anonymous'

 if not added:
 filtered_resources.append(filtered_resource)

 return filtered_resources

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Generate integrity hash for scripts/link tags on the index.#442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

T4rk1n
wants to merge
10
commits into

from

 Closed


Generate integrity hash for scripts/link tags on the index.
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6b56ebb

Add integrity hash utils functions.


T4rk1n Oct 30, 2018
fe0b6bb

Add integrity hash to generated script/link tags.


T4rk1n Oct 30, 2018
e8146f1

pylint fix.


T4rk1n Oct 30, 2018
ef94ab4

Use a custom memoize instead of lru_cache for py2 support.


T4rk1n Oct 30, 2018
027d709

Fix line length & disable old-style-class globally.


T4rk1n Oct 30, 2018
aec70fb

:camel: integrity hash generation.


T4rk1n Oct 31, 2018
e07ed47

Find local file for unpkg url.


T4rk1n Oct 31, 2018
222533b

pylint fixes


T4rk1n Oct 31, 2018
ee9c1d7

Fix link that already got an href value.


T4rk1n Oct 31, 2018
d45b209

Fix memoize kwargs.


T4rk1n Nov 5, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ confidence=
disable=fixme,
 missing-docstring,
 invalid-name,
 too-many-lines
 too-many-lines,
 old-style-class
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down

52 changes: 52 additions & 0 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
import functools
import hashlib
import base64
import pkgutil


def memoize(func):
 results = {}

 @functools.wraps(func)
 def wrapper(*args, **kwargs):
 key = hash((args, frozenset(kwargs.items())))
 cached = results.get(key)
 if cached:
 return cached
 results[key] = r = func(*args, **kwargs)
 return r

 return wrapper


def interpolate_str(template, **data):
 s = template
 for k, v in data.items():
Expand DownExpand Up@@ -37,6 +58,37 @@ def get_asset_path(
 ])


def pluck(obj, *props, **additions):
 return dict({k: v for k, v in obj.items() if k in props}, **additions)


def first_key(data, *keys):
 for key in keys:
 value = data.get(key)
 if value:
 return key, value
 return None, None


def _integrity_hash(b):
 h = hashlib.sha384(b)

 return 'sha384-{}'.format(
 base64.b64encode(h.digest()).decode()
 )


@memoize
def integrity_hash_from_file(filename):
 with open(filename, 'rb') as f:
 return _integrity_hash(f.read())


@memoize
def integrity_hash_from_package(namespace, path):
 return _integrity_hash(pkgutil.get_data(namespace, path))


class AttributeDict(dict):
 """
 Dictionary subclass enabling attribute lookup/assignment of keys/values.
Expand Down

56 changes: 46 additions & 10 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
from ._utils import interpolate_str as _interpolate
from ._utils import format_tag as _format_tag
from ._utils import get_asset_path as _get_asset_path
from ._utils import pluck as _pluck
from . import _configs


Expand DownExpand Up@@ -313,6 +314,7 @@ def _collect_and_register_resources(self, resources):
 def _relative_url_path(relative_package_path='', namespace=''):

 # track the registered packages
 # FIXME it append a new path each time the index is served ?
 if namespace in self.registered_paths:
 self.registered_paths[namespace].append(relative_package_path)
 else:
Expand All@@ -332,23 +334,34 @@ def _relative_url_path(relative_package_path='', namespace=''):
 modified
 )

 def pack(src, **kwargs):
 return dict(kwargs, src=src)

 srcs = []
 for resource in resources:
 if 'relative_package_path' in resource:
 if isinstance(resource['relative_package_path'], str):
 srcs.append(_relative_url_path(**resource))
 srcs.append(
 pack(
 _relative_url_path(
 resource['relative_package_path'],
 resource['namespace']),
 **resource)
 )
 else:
 for rel_path in resource['relative_package_path']:
 srcs.append(_relative_url_path(
 srcs.append(pack(_relative_url_path(
 relative_package_path=rel_path,
 namespace=resource['namespace']
 ))
 namespace=resource['namespace'],
 ), **resource))
 elif 'external_url' in resource:
 if isinstance(resource['external_url'], str):
 srcs.append(resource['external_url'])
 srcs.append(
 pack(resource['external_url'], **resource)
 )
 else:
 for url in resource['external_url']:
 srcs.append(url)
 srcs.append(pack(url))
 elif 'absolute_path' in resource:
 raise Exception(
 'Serving files from absolute_path isn\'t supported yet'
Expand All@@ -357,15 +370,30 @@ def _relative_url_path(relative_package_path='', namespace=''):
 static_url = self.get_asset_url(resource['asset_path'])
 # Add a bust query param
 static_url += '?m={}'.format(resource['ts'])
 srcs.append(static_url)
 srcs.append(pack(static_url, **resource))
 return srcs

 def _generate_css_dist_html(self):
 links = self._external_stylesheets + \
 self._collect_and_register_resources(self.css.get_all_css())

 return '\n'.join([
 _format_tag('link', link, opened=True)
 _format_tag(
 'link',
 _pluck(
 link,
 'integrity',
 'crossorigin',
 'media',
 'charset',
 'rev',
 'target',
 'type',
 href=link.get('src', link.get('href')),
 rel='stylesheet'
 ),
 opened=True
 )
 if isinstance(link, dict)
 else '<link rel="stylesheet" href="{}">'.format(link)
 for link in links
Expand All@@ -392,7 +420,15 @@ def _generate_scripts_html(self):
 ))

 return '\n'.join([
 _format_tag('script', src)
 _format_tag('script', _pluck(
 src,
 'src',
 'integrity',
 'crossorigin',
 'charset',
 'async',
 'defer',
 'type'))
 if isinstance(src, dict)
 else '<script src="{}"></script>'.format(src)
 for src in srcs
Expand DownExpand Up@@ -492,7 +528,7 @@ def index(self, *args, **kwargs): # pylint: disable=unused-argument
 checks = (
 (_re_index_entry_id.search(index), '#react-entry-point'),
 (_re_index_config_id.search(index), '#_dash-configs'),
 (_re_index_scripts_id.search(index), 'dash-renderer'),
# (_re_index_scripts_id.search(index), 'dash-renderer'),
 )
 missing = [missing for check, missing in checks if not check]

Expand Down

63 changes: 62 additions & 1 deletion
dash/resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,27 @@
import os

from .development.base_component import Component
from ._utils import \
 first_key, integrity_hash_from_file, integrity_hash_from_package


# pylint: disable=inconsistent-return-statements
def find_unpkg(value, relative_package_paths):
 # find the local file for a unpkg url.
 # The structure of the _js_dist/_css_dist does not allow
 # for easy translation between local and external dependencies.
 v = value.replace('https://unpkg.com/', '')
 s = v.split('/')
 lib, version = s[0].split('@')
 filename = s[-1]
 ext = filename.split('.')[-1]

 for i in relative_package_paths:
 if (i == filename and i not in [
 'index.js', 'index.css', 'style.css', 'style.min.css',
 'styles.css', 'styles.min.css']) \
 or (lib in i and version in i and i.endswith(ext)):
 return i


# pylint: disable=old-style-class
Expand All@@ -16,14 +37,17 @@ def __init__(self, resource_name, layout):
 def append_resource(self, resource):
 self._resources.append(resource)

 # pylint: disable=too-many-branches
 def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resources = []
 for s in all_resources:
 filtered_resource = {}
 added = False
 if 'namespace' in s:
 filtered_resource['namespace'] = s['namespace']
 if 'external_url' in s and not self.config.serve_locally:
 filtered_resource['external_url'] = s['external_url']
 filtered_resource['local_file'] = s['relative_package_path']
 elif 'dev_package_path' in s and dev_bundles:
 filtered_resource['relative_package_path'] = (
 s['dev_package_path']
Expand All@@ -36,6 +60,9 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resource['absolute_path'] = s['absolute_path']
 elif 'asset_path' in s:
 info = os.stat(s['filepath'])
 filtered_resource['integrity'] = integrity_hash_from_file(
 s['filepath'])
 filtered_resource['crossorigin'] = 'anonymous'
 filtered_resource['asset_path'] = s['asset_path']
 filtered_resource['ts'] = info.st_mtime
 elif self.config.serve_locally:
Expand All@@ -54,7 +81,41 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 )
 )

 filtered_resources.append(filtered_resource)
 if 'integrity' not in filtered_resource \
 and 'namespace' in filtered_resource:
 key, filename = first_key(
 filtered_resource,
 'external_url',
 'dev_package_path',
 'relative_package_path'
 )
 if isinstance(filename, list):
 # flatten these dependencies and add a hash for each.
 for f in filename:
 local_file = filtered_resource.get('local_file')
 filename = find_unpkg(f, local_file) \
 if local_file else f.split('/')[-1]
 filtered_resources.append({
 key: f,
 'integrity': integrity_hash_from_package(
 filtered_resource['namespace'],
 filename),
 'crossorigin': 'anonymous',
 'namespace': filtered_resource['namespace']
 })
 added = True
 else:
 filename = filtered_resource.get(
 'local_file', filename.split('/')[-1])
 filtered_resource['integrity'] = \
 integrity_hash_from_package(
 filtered_resource['namespace'],
 filename
 )
 filtered_resource['crossorigin'] = 'anonymous'

 if not added:
 filtered_resources.append(filtered_resource)

 return filtered_resources

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Generate integrity hash for scripts/link tags on the index.#442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

T4rk1n
wants to merge
10
commits into

from

 Closed


Generate integrity hash for scripts/link tags on the index.
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6b56ebb

Add integrity hash utils functions.


T4rk1n Oct 30, 2018
fe0b6bb

Add integrity hash to generated script/link tags.


T4rk1n Oct 30, 2018
e8146f1

pylint fix.


T4rk1n Oct 30, 2018
ef94ab4

Use a custom memoize instead of lru_cache for py2 support.


T4rk1n Oct 30, 2018
027d709

Fix line length & disable old-style-class globally.


T4rk1n Oct 30, 2018
aec70fb

:camel: integrity hash generation.


T4rk1n Oct 31, 2018
e07ed47

Find local file for unpkg url.


T4rk1n Oct 31, 2018
222533b

pylint fixes


T4rk1n Oct 31, 2018
ee9c1d7

Fix link that already got an href value.


T4rk1n Oct 31, 2018
d45b209

Fix memoize kwargs.


T4rk1n Nov 5, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ confidence=
disable=fixme,
 missing-docstring,
 invalid-name,
 too-many-lines
 too-many-lines,
 old-style-class
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down

52 changes: 52 additions & 0 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
import functools
import hashlib
import base64
import pkgutil


def memoize(func):
 results = {}

 @functools.wraps(func)
 def wrapper(*args, **kwargs):
 key = hash((args, frozenset(kwargs.items())))
 cached = results.get(key)
 if cached:
 return cached
 results[key] = r = func(*args, **kwargs)
 return r

 return wrapper


def interpolate_str(template, **data):
 s = template
 for k, v in data.items():
Expand DownExpand Up@@ -37,6 +58,37 @@ def get_asset_path(
 ])


def pluck(obj, *props, **additions):
 return dict({k: v for k, v in obj.items() if k in props}, **additions)


def first_key(data, *keys):
 for key in keys:
 value = data.get(key)
 if value:
 return key, value
 return None, None


def _integrity_hash(b):
 h = hashlib.sha384(b)

 return 'sha384-{}'.format(
 base64.b64encode(h.digest()).decode()
 )


@memoize
def integrity_hash_from_file(filename):
 with open(filename, 'rb') as f:
 return _integrity_hash(f.read())


@memoize
def integrity_hash_from_package(namespace, path):
 return _integrity_hash(pkgutil.get_data(namespace, path))


class AttributeDict(dict):
 """
 Dictionary subclass enabling attribute lookup/assignment of keys/values.
Expand Down

56 changes: 46 additions & 10 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
from ._utils import interpolate_str as _interpolate
from ._utils import format_tag as _format_tag
from ._utils import get_asset_path as _get_asset_path
from ._utils import pluck as _pluck
from . import _configs


Expand DownExpand Up@@ -313,6 +314,7 @@ def _collect_and_register_resources(self, resources):
 def _relative_url_path(relative_package_path='', namespace=''):

 # track the registered packages
 # FIXME it append a new path each time the index is served ?
 if namespace in self.registered_paths:
 self.registered_paths[namespace].append(relative_package_path)
 else:
Expand All@@ -332,23 +334,34 @@ def _relative_url_path(relative_package_path='', namespace=''):
 modified
 )

 def pack(src, **kwargs):
 return dict(kwargs, src=src)

 srcs = []
 for resource in resources:
 if 'relative_package_path' in resource:
 if isinstance(resource['relative_package_path'], str):
 srcs.append(_relative_url_path(**resource))
 srcs.append(
 pack(
 _relative_url_path(
 resource['relative_package_path'],
 resource['namespace']),
 **resource)
 )
 else:
 for rel_path in resource['relative_package_path']:
 srcs.append(_relative_url_path(
 srcs.append(pack(_relative_url_path(
 relative_package_path=rel_path,
 namespace=resource['namespace']
 ))
 namespace=resource['namespace'],
 ), **resource))
 elif 'external_url' in resource:
 if isinstance(resource['external_url'], str):
 srcs.append(resource['external_url'])
 srcs.append(
 pack(resource['external_url'], **resource)
 )
 else:
 for url in resource['external_url']:
 srcs.append(url)
 srcs.append(pack(url))
 elif 'absolute_path' in resource:
 raise Exception(
 'Serving files from absolute_path isn\'t supported yet'
Expand All@@ -357,15 +370,30 @@ def _relative_url_path(relative_package_path='', namespace=''):
 static_url = self.get_asset_url(resource['asset_path'])
 # Add a bust query param
 static_url += '?m={}'.format(resource['ts'])
 srcs.append(static_url)
 srcs.append(pack(static_url, **resource))
 return srcs

 def _generate_css_dist_html(self):
 links = self._external_stylesheets + \
 self._collect_and_register_resources(self.css.get_all_css())

 return '\n'.join([
 _format_tag('link', link, opened=True)
 _format_tag(
 'link',
 _pluck(
 link,
 'integrity',
 'crossorigin',
 'media',
 'charset',
 'rev',
 'target',
 'type',
 href=link.get('src', link.get('href')),
 rel='stylesheet'
 ),
 opened=True
 )
 if isinstance(link, dict)
 else '<link rel="stylesheet" href="{}">'.format(link)
 for link in links
Expand All@@ -392,7 +420,15 @@ def _generate_scripts_html(self):
 ))

 return '\n'.join([
 _format_tag('script', src)
 _format_tag('script', _pluck(
 src,
 'src',
 'integrity',
 'crossorigin',
 'charset',
 'async',
 'defer',
 'type'))
 if isinstance(src, dict)
 else '<script src="{}"></script>'.format(src)
 for src in srcs
Expand DownExpand Up@@ -492,7 +528,7 @@ def index(self, *args, **kwargs): # pylint: disable=unused-argument
 checks = (
 (_re_index_entry_id.search(index), '#react-entry-point'),
 (_re_index_config_id.search(index), '#_dash-configs'),
 (_re_index_scripts_id.search(index), 'dash-renderer'),
# (_re_index_scripts_id.search(index), 'dash-renderer'),
 )
 missing = [missing for check, missing in checks if not check]

Expand Down

63 changes: 62 additions & 1 deletion
dash/resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,27 @@
import os

from .development.base_component import Component
from ._utils import \
 first_key, integrity_hash_from_file, integrity_hash_from_package


# pylint: disable=inconsistent-return-statements
def find_unpkg(value, relative_package_paths):
 # find the local file for a unpkg url.
 # The structure of the _js_dist/_css_dist does not allow
 # for easy translation between local and external dependencies.
 v = value.replace('https://unpkg.com/', '')
 s = v.split('/')
 lib, version = s[0].split('@')
 filename = s[-1]
 ext = filename.split('.')[-1]

 for i in relative_package_paths:
 if (i == filename and i not in [
 'index.js', 'index.css', 'style.css', 'style.min.css',
 'styles.css', 'styles.min.css']) \
 or (lib in i and version in i and i.endswith(ext)):
 return i


# pylint: disable=old-style-class
Expand All@@ -16,14 +37,17 @@ def __init__(self, resource_name, layout):
 def append_resource(self, resource):
 self._resources.append(resource)

 # pylint: disable=too-many-branches
 def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resources = []
 for s in all_resources:
 filtered_resource = {}
 added = False
 if 'namespace' in s:
 filtered_resource['namespace'] = s['namespace']
 if 'external_url' in s and not self.config.serve_locally:
 filtered_resource['external_url'] = s['external_url']
 filtered_resource['local_file'] = s['relative_package_path']
 elif 'dev_package_path' in s and dev_bundles:
 filtered_resource['relative_package_path'] = (
 s['dev_package_path']
Expand All@@ -36,6 +60,9 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resource['absolute_path'] = s['absolute_path']
 elif 'asset_path' in s:
 info = os.stat(s['filepath'])
 filtered_resource['integrity'] = integrity_hash_from_file(
 s['filepath'])
 filtered_resource['crossorigin'] = 'anonymous'
 filtered_resource['asset_path'] = s['asset_path']
 filtered_resource['ts'] = info.st_mtime
 elif self.config.serve_locally:
Expand All@@ -54,7 +81,41 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 )
 )

 filtered_resources.append(filtered_resource)
 if 'integrity' not in filtered_resource \
 and 'namespace' in filtered_resource:
 key, filename = first_key(
 filtered_resource,
 'external_url',
 'dev_package_path',
 'relative_package_path'
 )
 if isinstance(filename, list):
 # flatten these dependencies and add a hash for each.
 for f in filename:
 local_file = filtered_resource.get('local_file')
 filename = find_unpkg(f, local_file) \
 if local_file else f.split('/')[-1]
 filtered_resources.append({
 key: f,
 'integrity': integrity_hash_from_package(
 filtered_resource['namespace'],
 filename),
 'crossorigin': 'anonymous',
 'namespace': filtered_resource['namespace']
 })
 added = True
 else:
 filename = filtered_resource.get(
 'local_file', filename.split('/')[-1])
 filtered_resource['integrity'] = \
 integrity_hash_from_package(
 filtered_resource['namespace'],
 filename
 )
 filtered_resource['crossorigin'] = 'anonymous'

 if not added:
 filtered_resources.append(filtered_resource)

 return filtered_resources

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Generate integrity hash for scripts/link tags on the index.#442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

T4rk1n
wants to merge
10
commits into

from

 Closed


Generate integrity hash for scripts/link tags on the index.
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6b56ebb

Add integrity hash utils functions.


T4rk1n Oct 30, 2018
fe0b6bb

Add integrity hash to generated script/link tags.


T4rk1n Oct 30, 2018
e8146f1

pylint fix.


T4rk1n Oct 30, 2018
ef94ab4

Use a custom memoize instead of lru_cache for py2 support.


T4rk1n Oct 30, 2018
027d709

Fix line length & disable old-style-class globally.


T4rk1n Oct 30, 2018
aec70fb

:camel: integrity hash generation.


T4rk1n Oct 31, 2018
e07ed47

Find local file for unpkg url.


T4rk1n Oct 31, 2018
222533b

pylint fixes


T4rk1n Oct 31, 2018
ee9c1d7

Fix link that already got an href value.


T4rk1n Oct 31, 2018
d45b209

Fix memoize kwargs.


T4rk1n Nov 5, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ confidence=
disable=fixme,
 missing-docstring,
 invalid-name,
 too-many-lines
 too-many-lines,
 old-style-class
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down

52 changes: 52 additions & 0 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
import functools
import hashlib
import base64
import pkgutil


def memoize(func):
 results = {}

 @functools.wraps(func)
 def wrapper(*args, **kwargs):
 key = hash((args, frozenset(kwargs.items())))
 cached = results.get(key)
 if cached:
 return cached
 results[key] = r = func(*args, **kwargs)
 return r

 return wrapper


def interpolate_str(template, **data):
 s = template
 for k, v in data.items():
Expand DownExpand Up@@ -37,6 +58,37 @@ def get_asset_path(
 ])


def pluck(obj, *props, **additions):
 return dict({k: v for k, v in obj.items() if k in props}, **additions)


def first_key(data, *keys):
 for key in keys:
 value = data.get(key)
 if value:
 return key, value
 return None, None


def _integrity_hash(b):
 h = hashlib.sha384(b)

 return 'sha384-{}'.format(
 base64.b64encode(h.digest()).decode()
 )


@memoize
def integrity_hash_from_file(filename):
 with open(filename, 'rb') as f:
 return _integrity_hash(f.read())


@memoize
def integrity_hash_from_package(namespace, path):
 return _integrity_hash(pkgutil.get_data(namespace, path))


class AttributeDict(dict):
 """
 Dictionary subclass enabling attribute lookup/assignment of keys/values.
Expand Down

56 changes: 46 additions & 10 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
from ._utils import interpolate_str as _interpolate
from ._utils import format_tag as _format_tag
from ._utils import get_asset_path as _get_asset_path
from ._utils import pluck as _pluck
from . import _configs


Expand DownExpand Up@@ -313,6 +314,7 @@ def _collect_and_register_resources(self, resources):
 def _relative_url_path(relative_package_path='', namespace=''):

 # track the registered packages
 # FIXME it append a new path each time the index is served ?
 if namespace in self.registered_paths:
 self.registered_paths[namespace].append(relative_package_path)
 else:
Expand All@@ -332,23 +334,34 @@ def _relative_url_path(relative_package_path='', namespace=''):
 modified
 )

 def pack(src, **kwargs):
 return dict(kwargs, src=src)

 srcs = []
 for resource in resources:
 if 'relative_package_path' in resource:
 if isinstance(resource['relative_package_path'], str):
 srcs.append(_relative_url_path(**resource))
 srcs.append(
 pack(
 _relative_url_path(
 resource['relative_package_path'],
 resource['namespace']),
 **resource)
 )
 else:
 for rel_path in resource['relative_package_path']:
 srcs.append(_relative_url_path(
 srcs.append(pack(_relative_url_path(
 relative_package_path=rel_path,
 namespace=resource['namespace']
 ))
 namespace=resource['namespace'],
 ), **resource))
 elif 'external_url' in resource:
 if isinstance(resource['external_url'], str):
 srcs.append(resource['external_url'])
 srcs.append(
 pack(resource['external_url'], **resource)
 )
 else:
 for url in resource['external_url']:
 srcs.append(url)
 srcs.append(pack(url))
 elif 'absolute_path' in resource:
 raise Exception(
 'Serving files from absolute_path isn\'t supported yet'
Expand All@@ -357,15 +370,30 @@ def _relative_url_path(relative_package_path='', namespace=''):
 static_url = self.get_asset_url(resource['asset_path'])
 # Add a bust query param
 static_url += '?m={}'.format(resource['ts'])
 srcs.append(static_url)
 srcs.append(pack(static_url, **resource))
 return srcs

 def _generate_css_dist_html(self):
 links = self._external_stylesheets + \
 self._collect_and_register_resources(self.css.get_all_css())

 return '\n'.join([
 _format_tag('link', link, opened=True)
 _format_tag(
 'link',
 _pluck(
 link,
 'integrity',
 'crossorigin',
 'media',
 'charset',
 'rev',
 'target',
 'type',
 href=link.get('src', link.get('href')),
 rel='stylesheet'
 ),
 opened=True
 )
 if isinstance(link, dict)
 else '<link rel="stylesheet" href="{}">'.format(link)
 for link in links
Expand All@@ -392,7 +420,15 @@ def _generate_scripts_html(self):
 ))

 return '\n'.join([
 _format_tag('script', src)
 _format_tag('script', _pluck(
 src,
 'src',
 'integrity',
 'crossorigin',
 'charset',
 'async',
 'defer',
 'type'))
 if isinstance(src, dict)
 else '<script src="{}"></script>'.format(src)
 for src in srcs
Expand DownExpand Up@@ -492,7 +528,7 @@ def index(self, *args, **kwargs): # pylint: disable=unused-argument
 checks = (
 (_re_index_entry_id.search(index), '#react-entry-point'),
 (_re_index_config_id.search(index), '#_dash-configs'),
 (_re_index_scripts_id.search(index), 'dash-renderer'),
# (_re_index_scripts_id.search(index), 'dash-renderer'),
 )
 missing = [missing for check, missing in checks if not check]

Expand Down

63 changes: 62 additions & 1 deletion
dash/resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,27 @@
import os

from .development.base_component import Component
from ._utils import \
 first_key, integrity_hash_from_file, integrity_hash_from_package


# pylint: disable=inconsistent-return-statements
def find_unpkg(value, relative_package_paths):
 # find the local file for a unpkg url.
 # The structure of the _js_dist/_css_dist does not allow
 # for easy translation between local and external dependencies.
 v = value.replace('https://unpkg.com/', '')
 s = v.split('/')
 lib, version = s[0].split('@')
 filename = s[-1]
 ext = filename.split('.')[-1]

 for i in relative_package_paths:
 if (i == filename and i not in [
 'index.js', 'index.css', 'style.css', 'style.min.css',
 'styles.css', 'styles.min.css']) \
 or (lib in i and version in i and i.endswith(ext)):
 return i


# pylint: disable=old-style-class
Expand All@@ -16,14 +37,17 @@ def __init__(self, resource_name, layout):
 def append_resource(self, resource):
 self._resources.append(resource)

 # pylint: disable=too-many-branches
 def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resources = []
 for s in all_resources:
 filtered_resource = {}
 added = False
 if 'namespace' in s:
 filtered_resource['namespace'] = s['namespace']
 if 'external_url' in s and not self.config.serve_locally:
 filtered_resource['external_url'] = s['external_url']
 filtered_resource['local_file'] = s['relative_package_path']
 elif 'dev_package_path' in s and dev_bundles:
 filtered_resource['relative_package_path'] = (
 s['dev_package_path']
Expand All@@ -36,6 +60,9 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resource['absolute_path'] = s['absolute_path']
 elif 'asset_path' in s:
 info = os.stat(s['filepath'])
 filtered_resource['integrity'] = integrity_hash_from_file(
 s['filepath'])
 filtered_resource['crossorigin'] = 'anonymous'
 filtered_resource['asset_path'] = s['asset_path']
 filtered_resource['ts'] = info.st_mtime
 elif self.config.serve_locally:
Expand All@@ -54,7 +81,41 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 )
 )

 filtered_resources.append(filtered_resource)
 if 'integrity' not in filtered_resource \
 and 'namespace' in filtered_resource:
 key, filename = first_key(
 filtered_resource,
 'external_url',
 'dev_package_path',
 'relative_package_path'
 )
 if isinstance(filename, list):
 # flatten these dependencies and add a hash for each.
 for f in filename:
 local_file = filtered_resource.get('local_file')
 filename = find_unpkg(f, local_file) \
 if local_file else f.split('/')[-1]
 filtered_resources.append({
 key: f,
 'integrity': integrity_hash_from_package(
 filtered_resource['namespace'],
 filename),
 'crossorigin': 'anonymous',
 'namespace': filtered_resource['namespace']
 })
 added = True
 else:
 filename = filtered_resource.get(
 'local_file', filename.split('/')[-1])
 filtered_resource['integrity'] = \
 integrity_hash_from_package(
 filtered_resource['namespace'],
 filename
 )
 filtered_resource['crossorigin'] = 'anonymous'

 if not added:
 filtered_resources.append(filtered_resource)

 return filtered_resources

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Generate integrity hash for scripts/link tags on the index.#442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

T4rk1n
wants to merge
10
commits into

from

 Closed


Generate integrity hash for scripts/link tags on the index.
#442
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6b56ebb

Add integrity hash utils functions.


T4rk1n Oct 30, 2018
fe0b6bb

Add integrity hash to generated script/link tags.


T4rk1n Oct 30, 2018
e8146f1

pylint fix.


T4rk1n Oct 30, 2018
ef94ab4

Use a custom memoize instead of lru_cache for py2 support.


T4rk1n Oct 30, 2018
027d709

Fix line length & disable old-style-class globally.


T4rk1n Oct 30, 2018
aec70fb

:camel: integrity hash generation.


T4rk1n Oct 31, 2018
e07ed47

Find local file for unpkg url.


T4rk1n Oct 31, 2018
222533b

pylint fixes


T4rk1n Oct 31, 2018
ee9c1d7

Fix link that already got an href value.


T4rk1n Oct 31, 2018
d45b209

Fix memoize kwargs.


T4rk1n Nov 5, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
.pylintrc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,8 @@ confidence=
disable=fixme,
 missing-docstring,
 invalid-name,
 too-many-lines
 too-many-lines,
 old-style-class
# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
# multiple time (only on the command line, not in the configuration file where
Expand Down

52 changes: 52 additions & 0 deletions
dash/_utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
import functools
import hashlib
import base64
import pkgutil


def memoize(func):
 results = {}

 @functools.wraps(func)
 def wrapper(*args, **kwargs):
 key = hash((args, frozenset(kwargs.items())))
 cached = results.get(key)
 if cached:
 return cached
 results[key] = r = func(*args, **kwargs)
 return r

 return wrapper


def interpolate_str(template, **data):
 s = template
 for k, v in data.items():
Expand DownExpand Up@@ -37,6 +58,37 @@ def get_asset_path(
 ])


def pluck(obj, *props, **additions):
 return dict({k: v for k, v in obj.items() if k in props}, **additions)


def first_key(data, *keys):
 for key in keys:
 value = data.get(key)
 if value:
 return key, value
 return None, None


def _integrity_hash(b):
 h = hashlib.sha384(b)

 return 'sha384-{}'.format(
 base64.b64encode(h.digest()).decode()
 )


@memoize
def integrity_hash_from_file(filename):
 with open(filename, 'rb') as f:
 return _integrity_hash(f.read())


@memoize
def integrity_hash_from_package(namespace, path):
 return _integrity_hash(pkgutil.get_data(namespace, path))


class AttributeDict(dict):
 """
 Dictionary subclass enabling attribute lookup/assignment of keys/values.
Expand Down

56 changes: 46 additions & 10 deletions
dash/dash.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@
from ._utils import interpolate_str as _interpolate
from ._utils import format_tag as _format_tag
from ._utils import get_asset_path as _get_asset_path
from ._utils import pluck as _pluck
from . import _configs


Expand DownExpand Up@@ -313,6 +314,7 @@ def _collect_and_register_resources(self, resources):
 def _relative_url_path(relative_package_path='', namespace=''):

 # track the registered packages
 # FIXME it append a new path each time the index is served ?
 if namespace in self.registered_paths:
 self.registered_paths[namespace].append(relative_package_path)
 else:
Expand All@@ -332,23 +334,34 @@ def _relative_url_path(relative_package_path='', namespace=''):
 modified
 )

 def pack(src, **kwargs):
 return dict(kwargs, src=src)

 srcs = []
 for resource in resources:
 if 'relative_package_path' in resource:
 if isinstance(resource['relative_package_path'], str):
 srcs.append(_relative_url_path(**resource))
 srcs.append(
 pack(
 _relative_url_path(
 resource['relative_package_path'],
 resource['namespace']),
 **resource)
 )
 else:
 for rel_path in resource['relative_package_path']:
 srcs.append(_relative_url_path(
 srcs.append(pack(_relative_url_path(
 relative_package_path=rel_path,
 namespace=resource['namespace']
 ))
 namespace=resource['namespace'],
 ), **resource))
 elif 'external_url' in resource:
 if isinstance(resource['external_url'], str):
 srcs.append(resource['external_url'])
 srcs.append(
 pack(resource['external_url'], **resource)
 )
 else:
 for url in resource['external_url']:
 srcs.append(url)
 srcs.append(pack(url))
 elif 'absolute_path' in resource:
 raise Exception(
 'Serving files from absolute_path isn\'t supported yet'
Expand All@@ -357,15 +370,30 @@ def _relative_url_path(relative_package_path='', namespace=''):
 static_url = self.get_asset_url(resource['asset_path'])
 # Add a bust query param
 static_url += '?m={}'.format(resource['ts'])
 srcs.append(static_url)
 srcs.append(pack(static_url, **resource))
 return srcs

 def _generate_css_dist_html(self):
 links = self._external_stylesheets + \
 self._collect_and_register_resources(self.css.get_all_css())

 return '\n'.join([
 _format_tag('link', link, opened=True)
 _format_tag(
 'link',
 _pluck(
 link,
 'integrity',
 'crossorigin',
 'media',
 'charset',
 'rev',
 'target',
 'type',
 href=link.get('src', link.get('href')),
 rel='stylesheet'
 ),
 opened=True
 )
 if isinstance(link, dict)
 else '<link rel="stylesheet" href="{}">'.format(link)
 for link in links
Expand All@@ -392,7 +420,15 @@ def _generate_scripts_html(self):
 ))

 return '\n'.join([
 _format_tag('script', src)
 _format_tag('script', _pluck(
 src,
 'src',
 'integrity',
 'crossorigin',
 'charset',
 'async',
 'defer',
 'type'))
 if isinstance(src, dict)
 else '<script src="{}"></script>'.format(src)
 for src in srcs
Expand DownExpand Up@@ -492,7 +528,7 @@ def index(self, *args, **kwargs): # pylint: disable=unused-argument
 checks = (
 (_re_index_entry_id.search(index), '#react-entry-point'),
 (_re_index_config_id.search(index), '#_dash-configs'),
 (_re_index_scripts_id.search(index), 'dash-renderer'),
# (_re_index_scripts_id.search(index), 'dash-renderer'),
 )
 missing = [missing for check, missing in checks if not check]

Expand Down

63 changes: 62 additions & 1 deletion
dash/resources.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,27 @@
import os

from .development.base_component import Component
from ._utils import \
 first_key, integrity_hash_from_file, integrity_hash_from_package


# pylint: disable=inconsistent-return-statements
def find_unpkg(value, relative_package_paths):
 # find the local file for a unpkg url.
 # The structure of the _js_dist/_css_dist does not allow
 # for easy translation between local and external dependencies.
 v = value.replace('https://unpkg.com/', '')
 s = v.split('/')
 lib, version = s[0].split('@')
 filename = s[-1]
 ext = filename.split('.')[-1]

 for i in relative_package_paths:
 if (i == filename and i not in [
 'index.js', 'index.css', 'style.css', 'style.min.css',
 'styles.css', 'styles.min.css']) \
 or (lib in i and version in i and i.endswith(ext)):
 return i


# pylint: disable=old-style-class
Expand All@@ -16,14 +37,17 @@ def __init__(self, resource_name, layout):
 def append_resource(self, resource):
 self._resources.append(resource)

 # pylint: disable=too-many-branches
 def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resources = []
 for s in all_resources:
 filtered_resource = {}
 added = False
 if 'namespace' in s:
 filtered_resource['namespace'] = s['namespace']
 if 'external_url' in s and not self.config.serve_locally:
 filtered_resource['external_url'] = s['external_url']
 filtered_resource['local_file'] = s['relative_package_path']
 elif 'dev_package_path' in s and dev_bundles:
 filtered_resource['relative_package_path'] = (
 s['dev_package_path']
Expand All@@ -36,6 +60,9 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 filtered_resource['absolute_path'] = s['absolute_path']
 elif 'asset_path' in s:
 info = os.stat(s['filepath'])
 filtered_resource['integrity'] = integrity_hash_from_file(
 s['filepath'])
 filtered_resource['crossorigin'] = 'anonymous'
 filtered_resource['asset_path'] = s['asset_path']
 filtered_resource['ts'] = info.st_mtime
 elif self.config.serve_locally:
Expand All@@ -54,7 +81,41 @@ def _filter_resources(self, all_resources, dev_bundles=False):
 )
 )

 filtered_resources.append(filtered_resource)
 if 'integrity' not in filtered_resource \
 and 'namespace' in filtered_resource:
 key, filename = first_key(
 filtered_resource,
 'external_url',
 'dev_package_path',
 'relative_package_path'
 )
 if isinstance(filename, list):
 # flatten these dependencies and add a hash for each.
 for f in filename:
 local_file = filtered_resource.get('local_file')
 filename = find_unpkg(f, local_file) \
 if local_file else f.split('/')[-1]
 filtered_resources.append({
 key: f,
 'integrity': integrity_hash_from_package(
 filtered_resource['namespace'],
 filename),
 'crossorigin': 'anonymous',
 'namespace': filtered_resource['namespace']
 })
 added = True
 else:
 filename = filtered_resource.get(
 'local_file', filename.split('/')[-1])
 filtered_resource['integrity'] = \
 integrity_hash_from_package(
 filtered_resource['namespace'],
 filename
 )
 filtered_resource['crossorigin'] = 'anonymous'

 if not added:
 filtered_resources.append(filtered_resource)

 return filtered_resources

Expand Down