summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-03-01 15:34:18 +0300
committerfox <fox@fakecake.org>2026-03-01 15:34:18 +0300
commit72b3e6c7491e41fee5b0744ddb8aa59c19c91aba (patch)
tree8cdbd0d3dd6c306b04694c3ab9bbbcdb01720f78
parent91552a4d01fe75a5cd49574b420271681283d0f0 (diff)
parentaa9fdfecfa2fe11c5ac010eeefee9c37b8d76595 (diff)
downloadthe-epube-android-26.03-72b3e6c7-signed.tar.gz
the-epube-android-26.03-72b3e6c7-signed.tar.xz
Merge branch 'dev' into 'master' 26.03-72b3e6c7-signed
add hacky mtls implementation

See merge request git/the-epube-android!2
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/KeyChainKeyManager.java53
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java46
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterModel.java48
3 files changed, 143 insertions, 4 deletions
diff --git a/org.fox.epube/src/main/java/org/fox/epube/KeyChainKeyManager.java b/org.fox.epube/src/main/java/org/fox/epube/KeyChainKeyManager.java
new file mode 100644
index 0000000..fae0262
--- /dev/null
+++ b/org.fox.epube/src/main/java/org/fox/epube/KeyChainKeyManager.java
@@ -0,0 +1,53 @@
+package org.fox.epube;
+
+import java.net.Socket;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.X509ExtendedKeyManager;
+
+public class KeyChainKeyManager extends X509ExtendedKeyManager {
+    private final String mClientAlias;
+    private final X509Certificate[] mCertificateChain;
+    private final PrivateKey mPrivateKey;
+
+    public KeyChainKeyManager(String clientAlias, X509Certificate[] certificateChain, PrivateKey privateKey) {
+        mClientAlias = clientAlias;
+        mCertificateChain = certificateChain;
+        mPrivateKey = privateKey;
+    }
+
+    @Override
+    public String chooseClientAlias(String[] keyTypes, Principal[] issuers, Socket socket) {
+        return mClientAlias;
+    }
+
+    @Override
+    public X509Certificate[] getCertificateChain(String alias) {
+        return mCertificateChain;
+    }
+
+    @Override
+    public PrivateKey getPrivateKey(String alias) {
+        return mPrivateKey;
+    }
+
+    @Override
+    public final String chooseServerAlias( String keyType, Principal[] issuers, Socket socket) {
+        // not a client SSLSocket callback
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final String[] getClientAliases(String keyType, Principal[] issuers) {
+        // not a client SSLSocket callback
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final String[] getServerAliases(String keyType, Principal[] issuers) {
+        // not a client SSLSocket callback
+        throw new UnsupportedOperationException();
+    }
+}
\ No newline at end of file
diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
index 2cd273a..5f9b77f 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;

 import android.content.Intent;

 import android.content.IntentFilter;

+import android.content.SharedPreferences;

 import android.content.res.ColorStateList;

 import android.content.res.Configuration;

 import android.graphics.Color;

@@ -12,6 +13,9 @@ import android.net.NetworkInfo;
 import android.net.Uri;

 import android.os.Build;

 import android.os.Bundle;

+import android.preference.PreferenceManager;

+import android.security.KeyChain;

+import android.security.KeyChainAliasCallback;

 import android.util.Log;

 import android.util.TypedValue;

 import android.view.Menu;

@@ -19,6 +23,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;

 import android.view.View;

 import android.view.Window;

+import android.webkit.ClientCertRequest;

 import android.webkit.CookieManager;

 import android.webkit.JavascriptInterface;

 import android.webkit.WebChromeClient;

@@ -42,6 +47,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
 

     private final String TAG = this.getClass().getSimpleName();

     private MasterModel m_model;

+    private SharedPreferences m_prefs;

 

     public enum AppPage {PAGE_UNKNOWN, PAGE_LOGIN, PAGE_LIBRARY, PAGE_FAVORITES, PAGE_OFFLINE, PAGE_READER}

 

@@ -67,6 +73,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         m_baseUrl = BuildConfig.EPUBE_BASE_URL;

 

         m_model = new ViewModelProvider(this).get(MasterModel.class);

+        m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

 

         startNetworkBroadcastReceiver(this);

 

@@ -140,6 +147,17 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
             }

 

             @Override

+            public void onReceivedClientCertRequest(WebView view, ClientCertRequest request) {

+                if ("".equals(m_prefs.getString("mtls_certificate_alias", ""))) {

+                    pickClientCertificate();

+

+                    request.cancel();

+                } else {

+                    request.proceed(m_model.getPrivateKey(), m_model.getClientCertChain());

+                }

+            }

+

+            @Override

             public void onPageFinished(WebView view, String url) {

                 CookieManager.getInstance().setAcceptCookie(true);

                 CookieManager.getInstance().acceptCookie();

@@ -516,4 +534,32 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         context.unregisterReceiver(m_networkStateReceiver);

     }

 

+    public void pickClientCertificate() {

+        KeyChain.choosePrivateKeyAlias(

+                this, // The current Activity

+                new KeyChainAliasCallback() {

+                    @Override

+                    public void alias(String alias) {

+                        if (alias != null) {

+                            Log.d("pickClientCertificate", "picked key alias: " + alias);

+

+                            runOnUiThread(() -> {

+                                SharedPreferences.Editor editor = m_prefs.edit();

+                                editor.putString("mtls_certificate_alias", alias);

+                                editor.apply();

+

+                                finish();

+                                startActivity(getIntent());

+                            });

+                        }

+                    }

+                },

+                new String[]{"RSA", "DSA"}, // Acceptable key types

+                null, // Acceptable issuers (null for any)

+                null, // Host (null for any)

+                -1, // Port (-1 for any)

+                null // Default alias (optional)

+        );

+    }

+

 }
\ No newline at end of file
diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java b/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
index ec92707..eb54639 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
@@ -1,21 +1,26 @@
 package org.fox.epube;
 
 import android.app.Application;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.security.KeyChain;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-public class MasterModel extends AndroidViewModel {
-    public MasterModel(@NonNull Application application) {
-        super(application);
-    }
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
+public class MasterModel extends AndroidViewModel {
     private final MutableLiveData<Integer> m_themeColor = new MutableLiveData<>(-1);
     private final MutableLiveData<Integer> m_accentColor = new MutableLiveData<>(-1);
     private final MutableLiveData<MasterActivity.AppPage> m_currentPage = new MutableLiveData<>(MasterActivity.AppPage.PAGE_UNKNOWN);
     private final MutableLiveData<Boolean> m_isOffline = new MutableLiveData<>(false);
+    private final SharedPreferences m_prefs;
 
     public LiveData<Integer> getThemeColor() {
         return m_themeColor;
@@ -46,4 +51,39 @@ public class MasterModel extends AndroidViewModel {
     public LiveData<Boolean> getOffline() {
         return m_isOffline;
     }
+
+    private ExecutorService m_executor;
+
+    private MutableLiveData<X509Certificate[]> m_clientCertChain = new MutableLiveData<>(null);
+    private MutableLiveData<PrivateKey> m_clientCertKey = new MutableLiveData<>(null);
+
+    public MasterModel(@NonNull Application application) {
+        super(application);
+
+        m_prefs = PreferenceManager.getDefaultSharedPreferences(application);
+
+        // do we need concurrency or not?
+        m_executor = Executors.newSingleThreadExecutor();
+
+        String clientCertAlias = m_prefs.getString("mtls_certificate_alias", null);
+
+        if (clientCertAlias != null) {
+            m_executor.execute(() -> {
+                try {
+                    m_clientCertChain.postValue(KeyChain.getCertificateChain(application, clientCertAlias));
+                    m_clientCertKey.postValue(KeyChain.getPrivateKey(application, clientCertAlias));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            });
+        }
+    }
+
+    public X509Certificate[] getClientCertChain() {
+        return m_clientCertChain.getValue();
+    }
+
+    public PrivateKey getPrivateKey() {
+        return m_clientCertKey.getValue();
+    }
 }