Skip to content
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

Jump to bottom

migrate to Electron 2.x #237

Merged
merged 2 commits into from
Aug 28, 2018
Merged

migrate to Electron 2.x #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f25669f
migrate to electron 2.x, update electron-builder and electron-updater
trevj Aug 24, 2018
0519117
eliminate "no content security policy" warning
trevj Aug 24, 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
71 changes: 33 additions & 38 deletions src/server_manager/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,45 +15,40 @@
-->
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<!--<base href=".">-->
<meta name="google" content="notranslate">
<meta http-equiv="Content-Language" content="en">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
<!-- TODO: remove this once launched to a broader audience -->
<meta name="robots" content="noindex,noarchive">
<!-- TODO: update this description -->
<!-- <meta name="descripton" content="Outline is a browser extension that makes it easy to set up and access proxy services for your trusted friends and family.">
<meta property="og:description" content="Outline is a browser extension that makes it easy to set up and access proxy services for your trusted friends and family." /> -->

<link rel="shortcut icon" href="/ui_components/images/favicon.png">
<link rel="stylesheet" href="/ui_components/style.css">
<script src="/bower_components/webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="/bower_components/app-layout/app-toolbar/app-toolbar.html">
<link rel="import" href="/ui_components/app-root.html">

<!-- Only allow links in the Outline invite and DigitalOcean pages to be included as an iframe -->
<meta http-equiv="Content-Security-Policy" content="frame-src ss://* macappstore://* https://s3.amazonaws.com/outline-vpn/ https://cloud.digitalocean.com https://github.com/;">
<script src="server_manager/web_app/main.js"></script>

<style>
body {
-webkit-font-smoothing: antialiased;
}

/* Show gray background when a dialog is opened */
core-overlay-layer.core-opened {
background-color: rgba(0, 0, 0, 0.5);
width: 100%;
height: 100%;
}
</style>

<title>Outline Manager</title>
</head>

<head>
<meta charset="UTF-8">
<meta http-equiv="Content-Language" content="en">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">

<link rel="shortcut icon" href="/ui_components/images/favicon.png">
<link rel="stylesheet" href="/ui_components/style.css">
<script src="/bower_components/webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="/bower_components/app-layout/app-toolbar/app-toolbar.html">
<link rel="import" href="/ui_components/app-root.html">
<script src="server_manager/web_app/main.js"></script>

<!-- TODO: Add Outline servers to connect-src on-demand (in addition to the DigitalOcean API). -->
<meta http-equiv="Content-Security-Policy" content="default-src 'unsafe-inline' outline:; connect-src https:; frame-src https://s3.amazonaws.com/outline-vpn/">
Copy link
Contributor

@alalamav alalamav Aug 24, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about the other non-http protocols, i.e. macappstore://, ss://?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think they were ever relevant!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure? The invitation page links to macappstore:// for downloading the macOS client and ss:// for importing the server when the app is already installed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

click The iframe-d invite? I just tested and:

  • Mac App Store opens without mapappstore:// in the CSP
  • ss:// link doesn't open with or without macappstore:// in the CSP (in other words, it's broken as-is - I just filed an issue)


<style>
body {
-webkit-font-smoothing: antialiased;
}

/* Show gray background when a dialog is opened */
core-overlay-layer.core-opened {
background-color: rgba(0, 0, 0, 0.5);
width: 100%;
height: 100%;
}
</style>

<title>Outline Manager</title>
</head>

<body dir='ltr' class='page-cloud-install'>
<app-root id="appRoot"></app-root>
</body>
</html>

</html>
6 changes: 3 additions & 3 deletions src/server_manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"body-parser": "^1.18.3",
"bytes": "^3.0.0",
"clipboard-polyfill": "^2.4.6",
"electron-updater": "^2.21.0",
"electron-updater": "^2.23.3",
"eventemitter3": "^2.0.3",
"express": "^4.16.3",
"node-forge": "^0.7.1",
Expand All @@ -26,8 +26,8 @@
"@types/request": "^2.47.1",
"bower": "^1.8.0",
"browserify": "^14.5.0",
"electron": "^1.8.7",
"electron-builder": "^20.13.4",
"electron": "^2.0.8",
"electron-builder": "^20.28.2",
"electron-icon-maker": "^0.0.4"
},
"scripts": {
Expand Down
Loading