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

Fixed curl import without valid tokens (#3933)

Browse Source
This commit is contained in:
Nidhi 2021-04-09 14:03:53 +05:30 committed by GitHub
parent 5a49feda07
commit 4bddfa0a4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
View File

@ -255,7 +255,7 @@ public class CurlImporterService extends BaseApiImporter {
public ActionDTO parse(List<String> tokens) throws AppsmithException {
// Curl argument parsing as per <https://linux.die.net/man/1/curl>.
if (!"curl".equals(tokens.get(0))) {
if (tokens.isEmpty() || !"curl".equals(tokens.get(0))) {
// Doesn't look like a curl command.
return null;
}

25
app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
View File

@ -4,10 +4,12 @@ import com.appsmith.external.models.ActionConfiguration;
import com.appsmith.external.models.Property;
import com.appsmith.external.plugins.PluginExecutor;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.domains.Application;
import com.appsmith.server.domains.User;
import com.appsmith.server.dtos.ActionDTO;
import com.appsmith.server.dtos.PageDTO;
import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import lombok.extern.slf4j.Slf4j;
import org.junit.Before;
@ -102,6 +104,27 @@ public class CurlImporterServiceTest {
.isEqualTo(List.of("curl", "some args with lots of space"));
}
@Test
@WithUserDetails(value = "api_user")
public void testImportAction_EmptyLex() {
// Set up the application & page for which this import curl action would be added
Application app = new Application();
app.setName("curlTest Incorrect Command");
Application application = applicationPageService.createApplication(app, orgId).block();
assert application != null;
PageDTO page = newPageService.findPageById(application.getPages().get(0).getId(), AclPermission.MANAGE_PAGES, false).block();
assert page != null;
Mono<ActionDTO> action = curlImporterService.importAction("'", page.getId(), "actionName", orgId);
StepVerifier
.create(action)
.expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
throwable.getMessage().equals(AppsmithError.INVALID_CURL_COMMAND.getMessage()))
.verify();
}
@Test
@WithUserDetails(value = "api_user")
public void importValidCurlCommand() {
@ -110,9 +133,11 @@ public class CurlImporterServiceTest {
app.setName("curlTest App");
Application application = applicationPageService.createApplication(app, orgId).block();
assert application != null;
PageDTO page = newPageService.findPageById(application.getPages().get(0).getId(), AclPermission.MANAGE_PAGES, false).block();
String command = "curl -X GET http://localhost:8080/api/v1/actions?name=something -H 'Accept: */*' -H 'Accept-Encoding: gzip, deflate' -H 'Authorization: Basic YXBpX3VzZXI6OHVBQDsmbUI6Y252Tn57Iw==' -H 'Cache-Control: no-cache' -H 'Connection: keep-alive' -H 'Content-Type: application/json' -H 'Cookie: SESSION=97c5def4-4f72-45aa-96fe-e8a9f5ade0b5,SESSION=97c5def4-4f72-45aa-96fe-e8a9f5ade0b5; SESSION=' -H 'Host: localhost:8080' -H 'Postman-Token: 16e4b6bc-2c7a-4ab1-a127-bca382dfc0f0,a6655daa-db07-4c5e-aca3-3fd505bd230d' -H 'User-Agent: PostmanRuntime/7.20.1' -H 'cache-control: no-cache' -d '{someJson}'";
assert page != null;
Mono<ActionDTO> action = curlImporterService.importAction(command, page.getId(), "actionName", orgId);
StepVerifier
.create(action)