Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mfa multitenancy #841

Merged
merged 19 commits into from
Oct 27, 2023
Merged

Mfa multitenancy #841

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d66f0f6
fix: multitenancy changes
sattvikc Oct 12, 2023
70e3fbc
fix: mfa cleanup
sattvikc Oct 12, 2023
69817f4
fix: mfa cleanup
sattvikc Oct 12, 2023
bab7139
fix: test
sattvikc Oct 12, 2023
ff7d7a6
Merge branch 'mfa-cleanup' into mfa-multitenancy
sattvikc Oct 12, 2023
2ebe359
fix: api
sattvikc Oct 13, 2023
58a678b
Merge branch 'feat/mfa' into mfa-multitenancy
sattvikc Oct 17, 2023
388050d
fix: mfa multitenancy updates
sattvikc Oct 17, 2023
a57eb0b
fix: tests
sattvikc Oct 18, 2023
b635437
fix: mfa
sattvikc Oct 20, 2023
3370897
Merge branch 'feat/mfa' into mfa-multitenancy
sattvikc Oct 20, 2023
914572b
fix: tests
sattvikc Oct 20, 2023
ef7cbc7
fix: tests
sattvikc Oct 20, 2023
8e80682
fix: pr comments
sattvikc Oct 25, 2023
3d338f4
fix: pr comments
sattvikc Oct 25, 2023
15f7312
fix: pr comments
sattvikc Oct 25, 2023
8683b9a
fix: tests
sattvikc Oct 25, 2023
59c794e
fix: tests
sattvikc Oct 26, 2023
b6f6ac0
fix: pr comments
sattvikc Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion coreDriverInterfaceSupported.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"2.20",
"2.21",
"3.0",
"4.0"
"4.0",
"4.1"
]
}
3 changes: 3 additions & 0 deletions ee/src/test/java/io/supertokens/ee/test/TestMultitenancyStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ public void testPaidStatsIsSentForAllAppsInMultitenancy() throws Exception {
new EmailPasswordConfig(true),
new ThirdPartyConfig(true, null),
new PasswordlessConfig(true),
new TotpConfig(false), null, null,
config
), false);

Expand All @@ -86,6 +87,7 @@ public void testPaidStatsIsSentForAllAppsInMultitenancy() throws Exception {
new EmailPasswordConfig(true),
new ThirdPartyConfig(true, null),
new PasswordlessConfig(true),
new TotpConfig(false), null, null,
config
), false);

Expand All @@ -94,6 +96,7 @@ public void testPaidStatsIsSentForAllAppsInMultitenancy() throws Exception {
new EmailPasswordConfig(true),
new ThirdPartyConfig(true, null),
new PasswordlessConfig(true),
new TotpConfig(false), null, null,
config
), false);
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/io/supertokens/inmemorydb/queries/multitenancy/TenantConfigSQLHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ public TenantConfig map(ResultSet result) throws StorageQueryException {
new EmailPasswordConfig(result.getBoolean("email_password_enabled")),
new ThirdPartyConfig(result.getBoolean("third_party_enabled"), this.providers),
new PasswordlessConfig(result.getBoolean("passwordless_enabled")),
JsonUtils.stringToJsonObject(result.getString("core_config"))
new TotpConfig(false), // TODO
null, null, JsonUtils.stringToJsonObject(result.getString("core_config"))
// TODO
);
} catch (Exception e) {
throw new StorageQueryException(e);
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/io/supertokens/multitenancy/MultitenancyHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ public static void init(Main main) throws StorageQueryException, IOException {
new TenantConfig(
new TenantIdentifier(null, null, null),
new EmailPasswordConfig(true), new ThirdPartyConfig(true, null),
rishabhpoddar marked this conversation as resolved.
Show resolved Hide resolved
new PasswordlessConfig(true), new JsonObject()), false, false, false);
new PasswordlessConfig(true), new TotpConfig(true),
null, null, new JsonObject()), false, false, false);
// Not force reloading all resources here (the last boolean in the function above)
// because the ucl for the FeatureFlag is not yet loaded and results in an empty
// instance of eeFeatureFlag. This is applicable only when the core is starting on
Expand All @@ -95,7 +96,8 @@ private TenantConfig[] getAllTenantsFromDb() throws StorageQueryException {
new EmailPasswordConfig(true),
new ThirdPartyConfig(true, null),
new PasswordlessConfig(true),
new JsonObject()
new TotpConfig(true),
null, null, new JsonObject()
)
};
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/supertokens/utils/SemVer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class SemVer implements Comparable<SemVer> {
public static final SemVer v2_21 = new SemVer("2.21");
public static final SemVer v3_0 = new SemVer("3.0");
public static final SemVer v4_0 = new SemVer("4.0");
public static final SemVer v4_1 = new SemVer("4.1");

final private String version;

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/io/supertokens/webserver/WebserverAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,11 @@ public abstract class WebserverAPI extends HttpServlet {
supportedVersions.add(SemVer.v2_21);
supportedVersions.add(SemVer.v3_0);
supportedVersions.add(SemVer.v4_0);
supportedVersions.add(SemVer.v4_1);
}

public static SemVer getLatestCDIVersion() {
return SemVer.v4_0;
return SemVer.v4_1;
}

public SemVer getLatestCDIVersionForRequest(HttpServletRequest req)
Expand Down
57 changes: 49 additions & 8 deletions src/main/java/io/supertokens/webserver/api/multitenancy/BaseCreateOrUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ public BaseCreateOrUpdate(Main main) {

protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdentifier,
TenantIdentifier targetTenantIdentifier, Boolean emailPasswordEnabled,
Boolean thirdPartyEnabled, Boolean passwordlessEnabled, JsonObject coreConfig,
HttpServletResponse resp)
Boolean thirdPartyEnabled, Boolean passwordlessEnabled, Boolean totpEnabled,
boolean hasFirstFactors, String[] firstFactors,
rishabhpoddar marked this conversation as resolved.
Show resolved Hide resolved
boolean hasDefaultRequiredFactorIds, String[] defaultRequiredFactorIds,
JsonObject coreConfig, HttpServletResponse resp)
throws ServletException, IOException {

TenantConfig tenantConfig = Multitenancy.getTenantInfo(main,
Expand All @@ -63,7 +65,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
new EmailPasswordConfig(true),
new ThirdPartyConfig(true, null),
new PasswordlessConfig(true),
new JsonObject()
new TotpConfig(true),
null, null, new JsonObject()
);
} else {
// We disable all recipes by default while creating tenant
Expand All @@ -72,7 +75,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
new EmailPasswordConfig(false),
new ThirdPartyConfig(false, null),
new PasswordlessConfig(false),
new JsonObject()
new TotpConfig(false),
null, null, new JsonObject()
);
}
createdNew = true;
Expand All @@ -84,7 +88,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
new EmailPasswordConfig(emailPasswordEnabled),
tenantConfig.thirdPartyConfig,
tenantConfig.passwordlessConfig,
tenantConfig.coreConfig
tenantConfig.totpConfig,
tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
);
}

Expand All @@ -94,7 +99,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
tenantConfig.emailPasswordConfig,
new ThirdPartyConfig(thirdPartyEnabled, tenantConfig.thirdPartyConfig.providers),
tenantConfig.passwordlessConfig,
tenantConfig.coreConfig
tenantConfig.totpConfig,
tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
);
}

Expand All @@ -104,7 +110,41 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
tenantConfig.emailPasswordConfig,
tenantConfig.thirdPartyConfig,
new PasswordlessConfig(passwordlessEnabled),
tenantConfig.coreConfig
tenantConfig.totpConfig,
tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
);
}

if (totpEnabled != null) {
tenantConfig = new TenantConfig(
tenantConfig.tenantIdentifier,
tenantConfig.emailPasswordConfig,
tenantConfig.thirdPartyConfig,
tenantConfig.passwordlessConfig,
new TotpConfig(totpEnabled),
tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
);
}

if (hasFirstFactors) {
tenantConfig = new TenantConfig(
tenantConfig.tenantIdentifier,
tenantConfig.emailPasswordConfig,
tenantConfig.thirdPartyConfig,
tenantConfig.passwordlessConfig,
tenantConfig.totpConfig,
firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
);
}

if (hasDefaultRequiredFactorIds) {
tenantConfig = new TenantConfig(
tenantConfig.tenantIdentifier,
tenantConfig.emailPasswordConfig,
tenantConfig.thirdPartyConfig,
tenantConfig.passwordlessConfig,
tenantConfig.totpConfig,
tenantConfig.firstFactors, defaultRequiredFactorIds, tenantConfig.coreConfig
);
}

Expand All @@ -115,7 +155,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
tenantConfig.emailPasswordConfig,
tenantConfig.thirdPartyConfig,
tenantConfig.passwordlessConfig,
coreConfig
tenantConfig.totpConfig,
tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, coreConfig
);
}

Expand Down
34 changes: 31 additions & 3 deletions src/main/java/io/supertokens/webserver/api/multitenancy/CreateOrUpdateAppAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package io.supertokens.webserver.api.multitenancy;

import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import io.supertokens.Main;
import io.supertokens.multitenancy.exception.BadPermissionException;
import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.utils.SemVer;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.Utils;
import io.supertokens.webserver.api.multitenancy.BaseCreateOrUpdate;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
Expand Down Expand Up @@ -56,6 +56,32 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
Boolean passwordlessEnabled = InputParser.parseBooleanOrThrowError(input, "passwordlessEnabled", true);
JsonObject coreConfig = InputParser.parseJsonObjectOrThrowError(input, "coreConfig", true);

Boolean totpEnabled = null;
String[] firstFactors = null;
boolean hasFirstFactors = false;
String[] defaultRequiredFactorIds = null;
boolean hasDefaultRequiredFactorIds = false;

if (getVersionFromRequest(req).greaterThanOrEqualTo(SemVer.v4_1)) {
totpEnabled = InputParser.parseBooleanOrThrowError(input, "totpEnabled", true);
hasFirstFactors = input.has("firstFactors");
if (hasFirstFactors && !input.get("firstFactors").isJsonNull()) {
JsonArray firstFactorsArr = InputParser.parseArrayOrThrowError(input, "firstFactors", true);
firstFactors = new String[firstFactorsArr.size()];
for (int i = 0; i < firstFactors.length; i++) {
firstFactors[i] = InputParser.parseStringFromElementOrThrowError(firstFactorsArr.get(i), "firstFactors", false);
}
}
hasDefaultRequiredFactorIds = input.has("defaultRequiredFactorIds");
if (hasDefaultRequiredFactorIds && !input.get("defaultRequiredFactorIds").isJsonNull()) {
JsonArray defaultRequiredFactorIdsArr = InputParser.parseArrayOrThrowError(input, "defaultRequiredFactorIds", true);
defaultRequiredFactorIds = new String[defaultRequiredFactorIdsArr.size()];
for (int i = 0; i < defaultRequiredFactorIds.length; i++) {
defaultRequiredFactorIds[i] = InputParser.parseStringFromElementOrThrowError(defaultRequiredFactorIdsArr.get(i), "defaultRequiredFactorIds", false);
}
}
}

TenantIdentifier sourceTenantIdentifier;
try {
sourceTenantIdentifier = this.getTenantIdentifierWithStorageFromRequest(req);
Expand All @@ -66,7 +92,9 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
super.handle(
req, sourceTenantIdentifier,
new TenantIdentifier(sourceTenantIdentifier.getConnectionUriDomain(), appId, null),
emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled, coreConfig, resp);
emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled,
totpEnabled, hasFirstFactors, firstFactors, hasDefaultRequiredFactorIds, defaultRequiredFactorIds,
coreConfig, resp);

}
}
32 changes: 31 additions & 1 deletion .../java/io/supertokens/webserver/api/multitenancy/CreateOrUpdateConnectionUriDomainAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@

package io.supertokens.webserver.api.multitenancy;

import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import io.supertokens.Main;
import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.utils.SemVer;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.Utils;
import jakarta.servlet.ServletException;
Expand Down Expand Up @@ -54,6 +56,32 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
Boolean passwordlessEnabled = InputParser.parseBooleanOrThrowError(input, "passwordlessEnabled", true);
JsonObject coreConfig = InputParser.parseJsonObjectOrThrowError(input, "coreConfig", true);

Boolean totpEnabled = null;
String[] firstFactors = null;
boolean hasFirstFactors = false;
String[] defaultRequiredFactorIds = null;
boolean hasDefaultRequiredFactorIds = false;

if (getVersionFromRequest(req).greaterThanOrEqualTo(SemVer.v4_1)) {
totpEnabled = InputParser.parseBooleanOrThrowError(input, "totpEnabled", true);
hasFirstFactors = input.has("firstFactors");
rishabhpoddar marked this conversation as resolved.
Show resolved Hide resolved
if (hasFirstFactors && !input.get("firstFactors").isJsonNull()) {
JsonArray firstFactorsArr = InputParser.parseArrayOrThrowError(input, "firstFactors", true);
firstFactors = new String[firstFactorsArr.size()];
for (int i = 0; i < firstFactors.length; i++) {
firstFactors[i] = InputParser.parseStringFromElementOrThrowError(firstFactorsArr.get(i), "firstFactors", false);
}
}
hasDefaultRequiredFactorIds = input.has("defaultRequiredFactorIds");
rishabhpoddar marked this conversation as resolved.
Show resolved Hide resolved
if (hasDefaultRequiredFactorIds && !input.get("defaultRequiredFactorIds").isJsonNull()) {
JsonArray defaultRequiredFactorIdsArr = InputParser.parseArrayOrThrowError(input, "defaultRequiredFactorIds", true);
defaultRequiredFactorIds = new String[defaultRequiredFactorIdsArr.size()];
for (int i = 0; i < defaultRequiredFactorIds.length; i++) {
defaultRequiredFactorIds[i] = InputParser.parseStringFromElementOrThrowError(defaultRequiredFactorIdsArr.get(i), "defaultRequiredFactorIds", false);
}
}
}

TenantIdentifier sourceTenantIdentifier;
try {
sourceTenantIdentifier = this.getTenantIdentifierWithStorageFromRequest(req);
Expand All @@ -64,7 +92,9 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
super.handle(
req, sourceTenantIdentifier,
new TenantIdentifier(connectionUriDomain, null, null),
emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled, coreConfig, resp);
emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled,
totpEnabled, hasFirstFactors, firstFactors, hasDefaultRequiredFactorIds, defaultRequiredFactorIds,
coreConfig, resp);

}
}
38 changes: 36 additions & 2 deletions ...in/java/io/supertokens/webserver/api/multitenancy/CreateOrUpdateTenantOrGetTenantAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

package io.supertokens.webserver.api.multitenancy;

import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import io.supertokens.Main;
import io.supertokens.config.CoreConfig;
import io.supertokens.multitenancy.Multitenancy;
import io.supertokens.pluginInterface.multitenancy.*;
import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
import io.supertokens.utils.SemVer;
import io.supertokens.webserver.InputParser;
import io.supertokens.webserver.Utils;
import jakarta.servlet.ServletException;
Expand Down Expand Up @@ -57,6 +59,32 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
Boolean passwordlessEnabled = InputParser.parseBooleanOrThrowError(input, "passwordlessEnabled", true);
JsonObject coreConfig = InputParser.parseJsonObjectOrThrowError(input, "coreConfig", true);

Boolean totpEnabled = null;
String[] firstFactors = null;
boolean hasFirstFactors = false;
String[] defaultRequiredFactorIds = null;
boolean hasDefaultRequiredFactorIds = false;

if (getVersionFromRequest(req).greaterThanOrEqualTo(SemVer.v4_1)) {
totpEnabled = InputParser.parseBooleanOrThrowError(input, "totpEnabled", true);
hasFirstFactors = input.has("firstFactors");
if (hasFirstFactors && !input.get("firstFactors").isJsonNull()) {
JsonArray firstFactorsArr = InputParser.parseArrayOrThrowError(input, "firstFactors", true);
firstFactors = new String[firstFactorsArr.size()];
for (int i = 0; i < firstFactors.length; i++) {
firstFactors[i] = InputParser.parseStringFromElementOrThrowError(firstFactorsArr.get(i), "firstFactors", false);
}
}
hasDefaultRequiredFactorIds = input.has("defaultRequiredFactorIds");
if (hasDefaultRequiredFactorIds && !input.get("defaultRequiredFactorIds").isJsonNull()) {
JsonArray defaultRequiredFactorIdsArr = InputParser.parseArrayOrThrowError(input, "defaultRequiredFactorIds", true);
defaultRequiredFactorIds = new String[defaultRequiredFactorIdsArr.size()];
for (int i = 0; i < defaultRequiredFactorIds.length; i++) {
defaultRequiredFactorIds[i] = InputParser.parseStringFromElementOrThrowError(defaultRequiredFactorIdsArr.get(i), "defaultRequiredFactorIds", false);
}
}
}

TenantIdentifier sourceTenantIdentifier;
try {
sourceTenantIdentifier = this.getTenantIdentifierWithStorageFromRequest(req);
Expand All @@ -67,8 +95,9 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
super.handle(
req, sourceTenantIdentifier,
new TenantIdentifier(sourceTenantIdentifier.getConnectionUriDomain(), sourceTenantIdentifier.getAppId(), tenantId),
emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled, coreConfig, resp);

emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled,
totpEnabled, hasFirstFactors, firstFactors, hasDefaultRequiredFactorIds, defaultRequiredFactorIds,
coreConfig, resp);
}

@Override
Expand All @@ -83,6 +112,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO
JsonObject result = config.toJson(shouldProtect, tenantIdentifier.getStorage(), CoreConfig.PROTECTED_CONFIGS);
result.addProperty("status", "OK");

if (getVersionFromRequest(req).lesserThan(SemVer.v4_1)) {
result.remove("totp");
result.remove("mfa");
}

super.sendJsonResponse(200, result, resp);
} catch (TenantOrAppNotFoundException e) {
JsonObject result = new JsonObject();
Expand Down
Loading