summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-02-01 13:55:25 +0100
committerLinus Färnstrand <linus@mullvad.net>2019-02-01 13:55:25 +0100
commite5492a8e1f251598c917c97f44ba8a4540ecfa50 (patch)
treecbff49ad2466061e159b16767a432c7d3c42a224 /gui
parent5eb1c48eb475b015945608977239394885070a01 (diff)
downloadmullvadvpn-e5492a8e1f251598c917c97f44ba8a4540ecfa50.tar.xz
mullvadvpn-e5492a8e1f251598c917c97f44ba8a4540ecfa50.zip
Renaming remaining mentions of "security" to "firewall"
Diffstat (limited to 'gui')
-rw-r--r--gui/packages/desktop/src/main/daemon-rpc.js2
-rw-r--r--gui/packages/desktop/src/main/index.js2
-rw-r--r--gui/packages/desktop/src/main/notification-controller.js2
-rw-r--r--gui/packages/desktop/src/renderer/components/Connect.js4
-rw-r--r--gui/packages/desktop/src/renderer/components/NotificationArea.js4
-rw-r--r--gui/packages/desktop/src/renderer/components/TunnelControl.js2
-rw-r--r--gui/packages/desktop/src/renderer/redux/connection/reducers.js2
-rw-r--r--gui/packages/desktop/src/shared/daemon-rpc-types.js2
8 files changed, 10 insertions, 10 deletions
diff --git a/gui/packages/desktop/src/main/daemon-rpc.js b/gui/packages/desktop/src/main/daemon-rpc.js
index 6b3ec60135..b5f19c9356 100644
--- a/gui/packages/desktop/src/main/daemon-rpc.js
+++ b/gui/packages/desktop/src/main/daemon-rpc.js
@@ -199,7 +199,7 @@ const TunnelStateTransitionSchema = oneOf(
object({
reason: enumeration(
'ipv6_unavailable',
- 'set_security_policy_error',
+ 'set_firewall_policy_error',
'set_dns_error',
'start_tunnel_error',
'no_matching_relay',
diff --git a/gui/packages/desktop/src/main/index.js b/gui/packages/desktop/src/main/index.js
index d13956cbc5..4da61bf3af 100644
--- a/gui/packages/desktop/src/main/index.js
+++ b/gui/packages/desktop/src/main/index.js
@@ -706,7 +706,7 @@ const ApplicationMain = {
case 'blocked':
switch (tunnelState.details.reason) {
- case 'set_security_policy_error':
+ case 'set_firewall_policy_error':
return 'unsecured';
default:
return 'securing';
diff --git a/gui/packages/desktop/src/main/notification-controller.js b/gui/packages/desktop/src/main/notification-controller.js
index 5b3a3ddbc7..b316c7f750 100644
--- a/gui/packages/desktop/src/main/notification-controller.js
+++ b/gui/packages/desktop/src/main/notification-controller.js
@@ -27,7 +27,7 @@ export default class NotificationController {
break;
case 'blocked':
switch (tunnelState.details.reason) {
- case 'set_security_policy_error':
+ case 'set_firewall_policy_error':
this._showTunnelStateNotification('Critical failure - Unsecured');
break;
default:
diff --git a/gui/packages/desktop/src/renderer/components/Connect.js b/gui/packages/desktop/src/renderer/components/Connect.js
index 08636ad567..e722f9184f 100644
--- a/gui/packages/desktop/src/renderer/components/Connect.js
+++ b/gui/packages/desktop/src/renderer/components/Connect.js
@@ -127,7 +127,7 @@ export default class Connect extends Component<Props> {
return 'secure';
case 'blocked':
switch (status.details.reason) {
- case 'set_security_policy_error':
+ case 'set_firewall_policy_error':
return 'unsecure';
default:
return 'secure';
@@ -232,7 +232,7 @@ export default class Connect extends Component<Props> {
return HeaderBarStyle.success;
case 'blocked':
switch (status.details.reason) {
- case 'set_security_policy_error':
+ case 'set_firewall_policy_error':
return HeaderBarStyle.error;
default:
return HeaderBarStyle.success;
diff --git a/gui/packages/desktop/src/renderer/components/NotificationArea.js b/gui/packages/desktop/src/renderer/components/NotificationArea.js
index cac4e2cd41..5e42f04d47 100644
--- a/gui/packages/desktop/src/renderer/components/NotificationArea.js
+++ b/gui/packages/desktop/src/renderer/components/NotificationArea.js
@@ -46,7 +46,7 @@ function getBlockReasonMessage(blockReason: BlockReason): string {
}
case 'ipv6_unavailable':
return 'Could not configure IPv6, please enable it on your system or disable it in the app';
- case 'set_security_policy_error':
+ case 'set_firewall_policy_error':
return 'Failed to apply firewall rules. The device might currently be unsecured';
case 'set_dns_error':
return 'Failed to set system DNS server';
@@ -83,7 +83,7 @@ export default class NotificationArea extends Component<Props, State> {
case 'blocked':
switch (tunnelState.details.reason) {
- case 'set_security_policy_error':
+ case 'set_firewall_policy_error':
return {
visible: true,
type: 'failure-unsecured',
diff --git a/gui/packages/desktop/src/renderer/components/TunnelControl.js b/gui/packages/desktop/src/renderer/components/TunnelControl.js
index e88693a3f3..fd84f7cc25 100644
--- a/gui/packages/desktop/src/renderer/components/TunnelControl.js
+++ b/gui/packages/desktop/src/renderer/components/TunnelControl.js
@@ -140,7 +140,7 @@ export default class TunnelControl extends Component<TunnelControlProps> {
switch (state) {
case 'blocked':
switch (this.props.tunnelState.details.reason) {
- case 'set_security_policy_error':
+ case 'set_firewall_policy_error':
state = 'disconnected';
break;
default:
diff --git a/gui/packages/desktop/src/renderer/redux/connection/reducers.js b/gui/packages/desktop/src/renderer/redux/connection/reducers.js
index d1f78c841f..23afc7f780 100644
--- a/gui/packages/desktop/src/renderer/redux/connection/reducers.js
+++ b/gui/packages/desktop/src/renderer/redux/connection/reducers.js
@@ -61,7 +61,7 @@ export default function(
return {
...state,
status: { state: 'blocked', details: action.reason },
- isBlocked: action.reason.reason !== 'set_security_policy_error',
+ isBlocked: action.reason.reason !== 'set_firewall_policy_error',
};
case 'ONLINE':
diff --git a/gui/packages/desktop/src/shared/daemon-rpc-types.js b/gui/packages/desktop/src/shared/daemon-rpc-types.js
index 9b39ba90c2..3d5a03b87e 100644
--- a/gui/packages/desktop/src/shared/daemon-rpc-types.js
+++ b/gui/packages/desktop/src/shared/daemon-rpc-types.js
@@ -16,7 +16,7 @@ export type BlockReason =
| {
reason:
| 'ipv6_unavailable'
- | 'set_security_policy_error'
+ | 'set_firewall_policy_error'
| 'set_dns_error'
| 'start_tunnel_error'
| 'no_matching_relay'