Skip to content

Commit

Permalink
Using updated CAP management URLs (#71)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergkh
sergkh authored Sep 8, 2021
1 parent b1afbb2 commit 3df03be
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions library/src/main/java/com/fidesmo/fdsm/AuthenticatedFidesmoApiClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ public void delete(URI uri) throws IOException {
}

// Upload a CAP file
public void upload(CAPFile cap) throws IOException {
public void upload(String appId, CAPFile cap) throws IOException {
Optional<String> javaCardVersion = cap.guessJavaCardVersion();
List<String> unsupportedVersions = Arrays.asList("3.1.0");
if (!javaCardVersion.isPresent() || unsupportedVersions.contains(javaCardVersion.get())) {
throw new IOException("Fidesmo supports JavaCard up to version 3.0.5");
}

HttpPost post = new HttpPost(getURI(ELF_URL));
HttpPost post = new HttpPost(getURI(CAPFILES_URL, appId));
// Metadata headers
post.setHeader("Java-Card-Version", cap.guessJavaCardVersion().get());
// Do not send this info at this moment
Expand Down
6 changes: 3 additions & 3 deletions library/src/main/java/com/fidesmo/fdsm/FidesmoApiClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import java.util.Map;

public class FidesmoApiClient {
public static final String APIv2 = "https://api.fidesmo.com/v2/";
public static final String APIv2 = "https://api.fidesmo.com/";

public static final String APPS_URL = "apps%s";
public static final String APP_INFO_URL = "apps/%s";
Expand All @@ -59,8 +59,8 @@ public class FidesmoApiClient {
public static final String SERVICE_RECIPE_URL = "apps/%s/services/%s/recipe";
public static final String RECIPE_SERVICES_URL = "apps/%s/recipe-services";

public static final String ELF_URL = "executableLoadFiles";
public static final String ELF_ID_URL = "executableLoadFiles/%s";
public static final String CAPFILES_URL = "apps/%s/capfiles";
public static final String CAPFILES_ID_URL = "apps/%s/capfiles/%s";

public static final String SERVICE_DELIVER_URL = "service/deliver";
public static final String SERVICE_FETCH_URL = "service/fetch";
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/java/com/fidesmo/fdsm/CommandLineInterface.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ abstract class CommandLineInterface {
final static protected OptionSpec<String> OPT_UNINSTALL = parser.accepts("uninstall", "Uninstall CAP from card").withRequiredArg().describedAs("CAP file / AID");

final static protected OptionSpec<String> OPT_APP_ID = parser.accepts("app-id", "Application identifier")
.requiredIf(OPT_STORE_DATA, OPT_SECURE_APDU, OPT_UNINSTALL, OPT_INSTALL, OPT_UPLOAD, OPT_CLEANUP)
.requiredIf(OPT_STORE_DATA, OPT_SECURE_APDU, OPT_UNINSTALL, OPT_INSTALL, OPT_UPLOAD, OPT_CLEANUP, OPT_LIST_APPLETS, OPT_FLUSH_APPLETS, OPT_DELETE_APPLET)
.withRequiredArg().describedAs("appId");
final static protected OptionSpec<Integer> OPT_QA = parser.accepts("qa", "Run a QA support session").withOptionalArg().ofType(Integer.class).describedAs("QA number");

Expand Down
14 changes: 7 additions & 7 deletions tool/src/main/java/com/fidesmo/fdsm/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static void main(String[] argv) {
}
}
try {
client.delete(client.getURI(FidesmoApiClient.ELF_ID_URL, id));
client.delete(client.getURI(FidesmoApiClient.CAPFILES_ID_URL, getAppId(), id));
System.out.println(id + " deleted.");
} catch (HttpResponseException e) {
if (e.getStatusCode() == 404) {
Expand All @@ -140,7 +140,7 @@ public static void main(String[] argv) {

// List applets
if (args.has(OPT_LIST_APPLETS)) {
JsonNode applets = client.rpc(client.getURI(FidesmoApiClient.ELF_URL));
JsonNode applets = client.rpc(client.getURI(FidesmoApiClient.CAPFILES_URL, getAppId()));
// Show applets, grouped by AID-s.
if (applets.size() > 0) {
Map<String, Map<String, String>> r = new HashMap<>();
Expand Down Expand Up @@ -211,12 +211,12 @@ public static void main(String[] argv) {
client.put(uri, recipe);
} else {
CAPFile cap = CAPFile.fromStream(new FileInputStream(args.valueOf(OPT_UPLOAD)));
client.upload(cap);
client.upload(getAppId(), cap);
}
} else if (args.has(OPT_FLUSH_APPLETS)) {
JsonNode applets = client.rpc(client.getURI(FidesmoApiClient.ELF_URL));
JsonNode applets = client.rpc(client.getURI(FidesmoApiClient.CAPFILES_URL, getAppId()));
for (JsonNode e : applets) {
client.delete(client.getURI(FidesmoApiClient.ELF_ID_URL, e.get("id").asText()));
client.delete(client.getURI(FidesmoApiClient.CAPFILES_ID_URL, getAppId(), e.get("id").asText()));
}
}
}
Expand Down Expand Up @@ -400,7 +400,7 @@ public static void main(String[] argv) {
}
}
byte[] lfdbh = cap.getLoadFileDataHash("SHA-256");
JsonNode applets = client.rpc(client.getURI(FidesmoApiClient.ELF_URL));
JsonNode applets = client.rpc(client.getURI(FidesmoApiClient.CAPFILES_URL, getAppId()));
boolean present = false;
for (JsonNode e : applets) {
if (Arrays.equals(Hex.decodeHex(e.get("id").asText()), lfdbh)) {
Expand All @@ -409,7 +409,7 @@ public static void main(String[] argv) {
}
// Upload
if (!present) {
authenticatedClient.upload(cap);
authenticatedClient.upload(getAppId(), cap);
}
ObjectNode recipe = RecipeGenerator.makeInstallRecipe(lfdbh, applet, instance, params);
FidesmoCard.deliverRecipe(bibo, fidesmoCard, authenticatedClient, formHandler, getAppId(), recipe);
Expand Down

0 comments on commit 3df03be

Please sign in to comment.