mirror of https://github.com/hashicorp/consul
Browse Source
* Configure ember-auto-import so we can use a stricter CSP * Create a fake filesystem using JSON to avoid inline scripts in index We used to have inline scripts in index.html in order to support embers filepath fingerprinting and our configurable rootURL. Instead of using inline scripts we use application/json plus a JSON blob to create a fake filesystem JSON blob/hash/map to hold all of the rootURL'ed fingerprinted file paths which we can then retrive later in non-inline scripts. We move our inlined polyfills script into the init.js external script, and we move the CodeMirror syntax highlighting configuration inline script into the main app itself - into the already existing CodeMirror initializer (this has been moved so we can lookup a service located document using ember's DI container) * Set a strict-ish CSP policy during developmentpull/9864/head
John Cowen
4 years ago
committed by
GitHub
7 changed files with 71 additions and 39 deletions
@ -0,0 +1,3 @@
|
||||
```release-note:improvement |
||||
ui: support stricter content security policies |
||||
``` |
@ -1,11 +0,0 @@
|
||||
export function initialize(application) { |
||||
const IvyCodeMirrorComponent = application.resolveRegistration('component:ivy-codemirror'); |
||||
// Make sure ivy-codemirror respects/maintains a `name=""` attribute
|
||||
IvyCodeMirrorComponent.reopen({ |
||||
attributeBindings: ['name'], |
||||
}); |
||||
} |
||||
|
||||
export default { |
||||
initialize, |
||||
}; |
@ -0,0 +1,30 @@
|
||||
/* globals CodeMirror */ |
||||
export function initialize(application) { |
||||
const appName = application.application.name; |
||||
const doc = application.lookup('service:-document'); |
||||
// pick codemirror syntax highlighting paths out of index.html
|
||||
const fs = JSON.parse(doc.querySelector(`[data-${appName}-fs]`).textContent); |
||||
// configure syntax highlighting for CodeMirror
|
||||
CodeMirror.modeURL = { |
||||
replace: function(n, mode) { |
||||
switch (mode) { |
||||
case 'javascript': |
||||
return fs['codemirror/mode/javascript/javascript.js']; |
||||
case 'ruby': |
||||
return fs['codemirror/mode/ruby/ruby.js']; |
||||
case 'yaml': |
||||
return fs['codemirror/mode/yaml/yaml.js']; |
||||
} |
||||
}, |
||||
}; |
||||
|
||||
const IvyCodeMirrorComponent = application.resolveRegistration('component:ivy-codemirror'); |
||||
// Make sure ivy-codemirror respects/maintains a `name=""` attribute
|
||||
IvyCodeMirrorComponent.reopen({ |
||||
attributeBindings: ['name'], |
||||
}); |
||||
} |
||||
|
||||
export default { |
||||
initialize, |
||||
}; |
Loading…
Reference in new issue