Procházet zdrojové kódy

allow PBKDF2 to be enabled/disabled via bubble file

tags/v1.4.8
Jonathan Cobb před 3 roky
rodič
revize
29de509a8c
2 změnil soubory, kde provedl 7 přidání a 1 odebrání
  1. +6
    -0
      bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java
  2. +1
    -1
      utils/cobbzilla-utils

+ 6
- 0
bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java Zobrazit soubor

@@ -4,6 +4,7 @@
*/
package bubble.server.listener;

import bubble.ApiConstants;
import bubble.dao.account.AccountDAO;
import bubble.dao.cloud.CloudServiceDAO;
import bubble.model.account.Account;
@@ -18,6 +19,7 @@ import bubble.service.device.StandardFlexRouterService;
import bubble.service.stream.AppDataCleaner;
import bubble.service.stream.AppPrimerService;
import lombok.extern.slf4j.Slf4j;
import org.cobbzilla.util.security.RsaKeyPair;
import org.cobbzilla.wizard.server.RestServer;
import org.cobbzilla.wizard.server.RestServerLifecycleListenerBase;

@@ -38,6 +40,10 @@ public class NodeInitializerListener extends RestServerLifecycleListenerBase<Bub
@Override public void beforeStart(RestServer server) {
final BubbleConfiguration c = (BubbleConfiguration) server.getConfiguration();

// special file to enable PBKDF2 in RSA for older releases
final File pbkdf2_enabled = new File(ApiConstants.HOME_DIR, ".pbkdf2_enabled");
RsaKeyPair.ENABLE_PBKDF2 = pbkdf2_enabled.exists();

// ensure we can reference our own jar file
final File bubbleJar = c.getBubbleJar();
if (bubbleJar == null || !bubbleJar.exists()) die("beforeStart: bubble jar file not found: "+abs(bubbleJar));


+ 1
- 1
utils/cobbzilla-utils

@@ -1 +1 @@
Subproject commit 3d8b5a8b74eaf0d5d778db5bc1479593c18838a0
Subproject commit 3e4dce3e3c14d1003f34070e9ddee2bbf5f475be

Načítá se…
Zrušit
Uložit