summaryrefslogtreecommitdiff
path: root/main/src/ui/java
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2021-08-13 14:48:01 +0200
committerArne Schwabe <arne@rfc2549.org>2021-08-13 14:48:01 +0200
commit2765afc92e13d9e751a036d53736bf42978e5b87 (patch)
tree109dd9bf82232433d225b45ca8f4277718e99f96 /main/src/ui/java
parente530ceb63981af11242421151b4e28639fbe31fd (diff)
Add WEB_AUTH pending auth support
Diffstat (limited to 'main/src/ui/java')
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java5
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/core/VariantConfig.java7
2 files changed, 8 insertions, 4 deletions
diff --git a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
index 419f49e2..1d81da1a 100644
--- a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -172,7 +172,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
config.setContent(vpnconfig);
config.setTunPersist(mVp.mPersistTun);
config.setGuiVersion(mVp.getVersionEnvString(mService));
- config.setSsoMethods("openurl,crtext");
+ config.setSsoMethods("openurl,webauth,`crtext");
config.setPlatformVersion(mVp.getPlatformVersionEnvString());
config.setExternalPkiAlias("extpki");
config.setCompressionMode("asym");
@@ -303,7 +303,8 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
String name = event.getName();
String info = event.getInfo();
if (name.equals("INFO")) {
- if (info.startsWith("OPEN_URL:") || info.startsWith("CR_TEXT:")) {
+ if (info.startsWith("OPEN_URL:") || info.startsWith("CR_TEXT:")
+ || info.startsWith("WEB_AUTH:")) {
mService.trigger_sso(info);
} else {
VpnStatus.logInfo(R.string.info_from_server, info);
diff --git a/main/src/ui/java/de/blinkt/openvpn/core/VariantConfig.java b/main/src/ui/java/de/blinkt/openvpn/core/VariantConfig.java
index 5db8382c..bc7df548 100644
--- a/main/src/ui/java/de/blinkt/openvpn/core/VariantConfig.java
+++ b/main/src/ui/java/de/blinkt/openvpn/core/VariantConfig.java
@@ -12,7 +12,10 @@ import de.blinkt.openvpn.activities.InternalWebView;
public class VariantConfig {
/** Return the normal webview or internal webview depending what is available */
- static Intent getOpenUrlIntent(Context c) {
- return new Intent(c, InternalWebView.class);
+ static Intent getOpenUrlIntent(Context c, boolean external) {
+ if (external)
+ return new Intent(Intent.ACTION_VIEW);
+ else
+ return new Intent(c, InternalWebView.class);
}
}