Skip to content

Commit

Permalink
Support client certificates
Browse files Browse the repository at this point in the history
This change adds support for configurations where the webserver requests a client certificate, e.g. via nginx configuration options ssl_client_certificate and ssl_verify_client.
The client certificate handling is done via InteractiveKeyManager which prompts for a client certificate from a file or the devices keystore.

This change is NOT about client certificate authentication to the nextcloud server instance. The regular authentication mechanisms will be used as soon as the communication on TLS level is established.

The change addresses ticket nextcloud#603, while not being a generic solution IMO.
  • Loading branch information
stephanritscher committed Jun 29, 2022
1 parent e12fcc0 commit 1ce76f4
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ dependencies {
// dependencies for app building
implementation 'androidx.multidex:multidex:2.0.1'
// implementation project('nextcloud-android-library')
implementation ("com.github.nextcloud:android-library:$androidLibraryVersion") {
implementation 'com.github.stephanritscher:InteractiveKeyManager:0.1'
implementation ("com.github.stephanritscher:nextcloud-android-library:$androidLibraryVersion") {
exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version
}

Expand Down
5 changes: 5 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,11 @@
android:name=".ui.preview.PreviewBitmapActivity"
android:exported="false"
android:theme="@style/Theme.ownCloud.OverlayGrey" />

<!-- InteractiveKeyManager -->
<activity
android:name="de.ritscher.ssl.SelectKeyStoreActivity"
android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar" />
</application>

<queries>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@
import android.preference.PreferenceManager;
import android.text.TextUtils;
import android.util.AndroidRuntimeException;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.webkit.ClientCertRequest;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.webkit.WebResourceRequest;
Expand Down Expand Up @@ -122,6 +124,7 @@
import com.owncloud.android.utils.theme.ThemeToolbarUtils;

import java.io.InputStream;
import java.net.URI;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Locale;
Expand All @@ -141,6 +144,7 @@
import de.cotech.hw.fido.ui.FidoDialogOptions;
import de.cotech.hw.fido2.WebViewWebauthnBridge;
import de.cotech.hw.fido2.ui.WebauthnDialogOptions;
import de.ritscher.ssl.InteractiveKeyManager;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

import static com.owncloud.android.utils.PermissionUtil.PERMISSIONS_CAMERA;
Expand Down Expand Up @@ -453,6 +457,17 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
if (!customError.isEmpty()) {
accountSetupWebviewBinding.loginWebview.loadData(customError, "text/html; charset=UTF-8", null);
}

if (errorCode >= 400 && errorCode < 500) {
URI uri = URI.create(failingUrl);
Log_OC.w(TAG, "WebView failed with error code " + errorCode + "; remove key chain aliases");
new InteractiveKeyManager(view.getContext()).removeKeys(uri.getHost(), uri.getPort());
}
}

@Override
public void onReceivedClientCertRequest(WebView view, ClientCertRequest request) {
new InteractiveKeyManager(view.getContext()).handleWebViewClientCertRequest(request);
}
});
}
Expand Down

0 comments on commit 1ce76f4

Please sign in to comment.