Merge pull request #2232 from nextcloud/bugfix/2218/dedicatedCookieStore

Push token recovery should not use the standard httpClient object

app/src/main/java/com/nextcloud/talk/jobs/PushRegistrationWorker.java

@@ -1,10 +1,12 @@
 /*
  * Nextcloud Talk application
  *
- * @author Mario Danic
+ * @author Andy Scherzinger
  * @author Marcel Hibbe
- * Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
+ * @author Mario Danic
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
  * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+ * Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,14 +31,28 @@ import androidx.annotation.NonNull;
 import androidx.work.Data;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
+import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
+import retrofit2.Retrofit;
 
+import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.utils.ClosedInterfaceImpl;
 import com.nextcloud.talk.utils.PushUtils;
 
+import java.net.CookieManager;
+
+import javax.inject.Inject;
+
 public class PushRegistrationWorker extends Worker {
     public static final String TAG = "PushRegistrationWorker";
     public static final String ORIGIN = "origin";
 
+    @Inject
+    Retrofit retrofit;
+
+    @Inject
+    OkHttpClient okHttpClient;
+
     public PushRegistrationWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
         super(context, workerParams);
     }
@@ -49,9 +65,18 @@ public class PushRegistrationWorker extends Worker {
             String origin = data.getString("origin");
             Log.d(TAG, "PushRegistrationWorker called via " + origin);
 
+            NcApi ncApi = retrofit
+                .newBuilder()
+                .client(okHttpClient
+                            .newBuilder()
+                            .cookieJar(new JavaNetCookieJar(new CookieManager()))
+                            .build())
+                .build()
+                .create(NcApi.class);
+
             PushUtils pushUtils = new PushUtils();
             pushUtils.generateRsa2048KeyPair();
-            pushUtils.pushRegistrationToServer();
+            pushUtils.pushRegistrationToServer(ncApi);
 
             return Result.success();
         }

app/src/main/java/com/nextcloud/talk/utils/PushUtils.java

@@ -1,10 +1,12 @@
 /*
  * Nextcloud Talk application
  *
- * @author Mario Danic
+ * @author Andy Scherzinger
  * @author Marcel Hibbe
- * Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
+ * @author Mario Danic
+ * Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
  * Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
+ * Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,9 +91,6 @@ public class PushUtils {
     @Inject
     EventBus eventBus;
 
-    @Inject
-    NcApi ncApi;
-
     private final File publicKeyFile;
     private final File privateKeyFile;
 
@@ -100,10 +99,17 @@ public class PushUtils {
     public PushUtils() {
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
-        String keyPath = NextcloudTalkApplication.Companion.getSharedApplication().getDir("PushKeystore", Context.MODE_PRIVATE).getAbsolutePath();
+        String keyPath = NextcloudTalkApplication
+            .Companion
+            .getSharedApplication()
+            .getDir("PushKeystore", Context.MODE_PRIVATE)
+            .getAbsolutePath();
         publicKeyFile = new File(keyPath, "push_key.pub");
         privateKeyFile = new File(keyPath, "push_key.priv");
-        proxyServer = NextcloudTalkApplication.Companion.getSharedApplication().getResources().
+        proxyServer = NextcloudTalkApplication
+            .Companion
+            .getSharedApplication()
+            .getResources().
             getString(R.string.nc_push_server_url);
     }
 
@@ -216,7 +222,7 @@ public class PushUtils {
         return -2;
     }
 
-    public void pushRegistrationToServer() {
+    public void pushRegistrationToServer(NcApi ncApi) {
         String token = appPreferences.getPushToken();
 
         if (!TextUtils.isEmpty(token)) {
@@ -227,7 +233,10 @@ public class PushUtils {
                 String devicePublicKeyBase64 = new String(devicePublicKeyBytes);
                 devicePublicKeyBase64 = devicePublicKeyBase64.replaceAll("(.{64})", "$1\n");
 
-                devicePublicKeyBase64 = "-----BEGIN PUBLIC KEY-----\n" + devicePublicKeyBase64 + "\n-----END PUBLIC KEY-----\n";
+                devicePublicKeyBase64 =
+                    "-----BEGIN PUBLIC KEY-----\n"
+                        + devicePublicKeyBase64
+                        + "\n-----END PUBLIC KEY-----\n";
 
                 if (userUtils.anyUserExists()) {
                     for (Object userEntityObject : userUtils.getUsers()) {
@@ -240,7 +249,7 @@ public class PushUtils {
                             nextcloudRegisterPushMap.put("devicePublicKey", devicePublicKeyBase64);
                             nextcloudRegisterPushMap.put("proxyServer", proxyServer);
 
-                            registerDeviceWithNextcloud(nextcloudRegisterPushMap, token, userEntity);
+                            registerDeviceWithNextcloud(ncApi, nextcloudRegisterPushMap, token, userEntity);
                         }
                     }
                 }
@@ -250,7 +259,10 @@ public class PushUtils {
         }
     }
 
-    private void registerDeviceWithNextcloud(Map<String, String> nextcloudRegisterPushMap, String token, UserEntity userEntity) {
+    private void registerDeviceWithNextcloud(NcApi ncApi,
+                                             Map<String, String> nextcloudRegisterPushMap,
+                                             String token,
+                                             UserEntity userEntity) {
         String credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken());
 
         ncApi.registerDeviceForNotificationsWithNextcloud(
@@ -269,14 +281,14 @@ public class PushUtils {
 
                     Map<String, String> proxyMap = new HashMap<>();
                     proxyMap.put("pushToken", token);
-                    proxyMap.put("deviceIdentifier", pushRegistrationOverall.getOcs().getData().
-                        getDeviceIdentifier());
-                    proxyMap.put("deviceIdentifierSignature", pushRegistrationOverall.getOcs()
-                        .getData().getSignature());
-                    proxyMap.put("userPublicKey", pushRegistrationOverall.getOcs()
-                        .getData().getPublicKey());
-
-                    registerDeviceWithPushProxy(proxyMap, userEntity);
+                    proxyMap.put("deviceIdentifier",
+                                 pushRegistrationOverall.getOcs().getData().getDeviceIdentifier());
+                    proxyMap.put("deviceIdentifierSignature",
+                                 pushRegistrationOverall.getOcs().getData().getSignature());
+                    proxyMap.put("userPublicKey",
+                                 pushRegistrationOverall.getOcs().getData().getPublicKey());
+
+                    registerDeviceWithPushProxy(ncApi, proxyMap, userEntity);
                 }
 
                 @Override
@@ -292,7 +304,7 @@ public class PushUtils {
             });
     }
 
-    private void registerDeviceWithPushProxy(Map<String, String> proxyMap, UserEntity userEntity) {
+    private void registerDeviceWithPushProxy(NcApi ncApi, Map<String, String> proxyMap, UserEntity userEntity) {
         ncApi.registerDeviceForNotificationsWithPushProxy(ApiUtils.getUrlPushProxy(), proxyMap)
             .subscribeOn(Schedulers.io())
             .subscribe(new Observer<Void>() {