Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix NPE (#4448)

Browse Source 
fix NPE
This commit is contained in:
Sumit Kumar 2021-05-13 11:59:43 +05:30 committed by GitHub
parent 66c7a0b252
commit e74d99b794
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java vendored
View File

@ -590,6 +590,22 @@ public class MongoPlugin extends BasePlugin {
}
}
private boolean hostStringHasConnectionURIHead(String host) {
if (!StringUtils.isEmpty(host) && (host.contains("mongodb://") || host.contains("mongodb+srv"))) {
return true;
}
return false;
}
private boolean isHostStringConnectionURI(Endpoint endpoint) {
if (endpoint != null && hostStringHasConnectionURIHead(endpoint.getHost())) {
return true;
}
return false;
}
@Override
public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
Set<String> invalids = new HashSet<>();
@ -641,7 +657,7 @@ public class MongoPlugin extends BasePlugin {
if (!CollectionUtils.isEmpty(endpoints)) {
boolean usingUri = endpoints
.stream()
.anyMatch(endPoint -> endPoint.getHost().matches(MONGO_URI_REGEX));
.anyMatch(endPoint -> isHostStringConnectionURI(endPoint));
if (usingUri) {
invalids.add("It seems that you are trying to use a mongo connection string URI. Please " +

7
app/server/appsmith-plugins/mongoPlugin/src/test/java/com/external/plugins/MongoPluginTest.java vendored
View File

@ -496,7 +496,12 @@ public class MongoPluginTest {
@Test
public void testErrorMessageOnNonSrvUri() {
DatasourceConfiguration dsConfig = createDatasourceConfiguration();
dsConfig.getEndpoints().get(0).setHost("mongodb://user:pass@url.net:1234,url.net:1234/dbName");
List<Endpoint> endpoints = new ArrayList<>();
endpoints.add(new Endpoint("url", 123L));
endpoints.add(null);
endpoints.add(new Endpoint(null, 123L));
endpoints.add(new Endpoint("mongodb://user:pass@url.net:1234,url.net:1234/dbName", 123L));
dsConfig.setEndpoints(endpoints);
dsConfig.setProperties(List.of(new Property("Import from URI", "No")));
Mono<Set<String>> invalidsMono = Mono.just(pluginExecutor.validateDatasource(dsConfig));