From b77838d1005c45740968816c70088dff2ad655d3 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 25 Sep 2014 16:41:34 +0000
Subject: [PATCH] #2021 fix - Added API services and some minor enhancements
---
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 169 --------------------------------------------------------
1 files changed, 0 insertions(+), 169 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index bf3ecdc..4032651 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -28,14 +28,10 @@
import net.curisit.integrity.commons.JsonUtils;
import net.curisit.integrity.commons.Utils;
import net.curisit.securis.DefaultExceptionHandler;
-import net.curisit.securis.LicenseGenerator;
-import net.curisit.securis.ReqGenerator;
import net.curisit.securis.SeCurisException;
-import net.curisit.securis.beans.LicenseBean;
import net.curisit.securis.beans.RequestBean;
import net.curisit.securis.db.License;
import net.curisit.securis.db.LicenseHistory;
-import net.curisit.securis.db.LicenseType;
import net.curisit.securis.db.Pack;
import net.curisit.securis.db.User;
import net.curisit.securis.security.BasicSecurityContext;
@@ -46,8 +42,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.bouncycastle.jce.provider.asymmetric.ec.ECUtil;
-import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
import com.google.inject.persist.Transactional;
@@ -67,9 +61,6 @@
@Inject
Provider<EntityManager> emProvider;
-
- @Inject
- LicenseGenerator licenseGenerator;
/**
*
@@ -290,167 +281,7 @@
return Response.ok(lic).build();
}
- /**
- * Extract the corresponding metadata for the Request license given
- * @param req
- * @return
- * @throws SeCurisException
- */
- @SuppressWarnings("unchecked")
- private Map<String, Object> getLicenseMetadata(RequestBean req) throws SeCurisException {
- // TODO: The dummy metadata file is temporal, this info should be read from DB
- File dummyMetadata = new File(System.getProperty("user.home") + File.separator + ".SeCuris" + File.separator + "dummy_metadata.json");
- Map<String, Object> metadata = null;
- try {
- String metadataJson = IOUtils.toString(dummyMetadata.toURI());
- metadata = (Map<String, Object>)JsonUtils.json2map(metadataJson).get(req.getAppCode());
- if (metadata == null)
- throw new SeCurisException("App code in request is unknown: " + req.getAppCode());
- metadata = new TreeMap<>(metadata);
- } catch (IOException e) {
- LOG.error("Error reading dummy metadata file", e);
- throw new SeCurisException("Error reading dummy metadata file");
- }
-
- return metadata;
- }
-
- private License getLicenseData(RequestBean req) throws SeCurisException {
- // TODO: The dummy expiration date is temporal, this info should be read from DB
- License lic = new License();
- lic.setExpirationDate(new Date(new Date().getTime() + (1000L * 3600 * 24 * 365 * 10)));
- lic.setCode(req.getAppCode() + "-LIC-INTERNAL");
- LicenseType lt = new LicenseType();
- lt.setCode("TYPE-" + req.getAppCode());
- Pack pack = new Pack();
- pack.setLicenseType(lt);
- lic.setPack(pack);
- return lic;
- }
-
- /**
- * Request a new license file based in a RequestBean object sent as parameter
- * @param mpfdi
- * @param bsc
- * @return
- * @throws IOException
- * @throws SeCurisServiceException
- */
- @POST
- @Path("/request")
- @Consumes(MediaType.APPLICATION_JSON)
- //TODO: Enable this: @Securable
- @Produces({
- MediaType.APPLICATION_JSON
- })
- @Transactional
- public Response createFromRequest(RequestBean request, @Context BasicSecurityContext bsc) throws IOException, SeCurisServiceException, SeCurisException {
- LOG.info("Request to get license: {}", request);
- Map<String, Object> metadata = getLicenseMetadata(request);
- License licDB = getLicenseData(request);
-
- Date expirationDate = licDB.getExpirationDate();
- String licenseTypeCode = licDB.getPack().getLicenseType().getCode();
- String licenseCode = licDB.getCode();
- LicenseBean lic = licenseGenerator.generateLicense(request, metadata, expirationDate, licenseTypeCode, licenseCode);
- return Response.ok(lic).build();
- }
-
- /**
- * Returns a License file in JSON format from an uploaded Request file
- * @param mpfdi
- * @param bsc
- * @return
- * @throws IOException
- * @throws SeCurisServiceException
- * @throws SeCurisException
- */
- @POST
- @Path("/request")
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- @Securable
- @Produces({
- MediaType.APPLICATION_JSON
- })
- @Transactional
- @SuppressWarnings("unchecked")
- public Response createFromRequestFile(MultipartFormDataInput mpfdi, @Context BasicSecurityContext bsc) throws IOException, SeCurisServiceException, SeCurisException {
- RequestBean req = new RequestBean();
- req.setAppCode(mpfdi.getFormDataPart("appCode", String.class, null));
- req.setArch(mpfdi.getFormDataPart("arch", String.class, null));
- req.setCrcLogo(mpfdi.getFormDataPart("crcLogo", String.class, null));
- req.setCustomerCode(mpfdi.getFormDataPart("customerCode", String.class, null));
- req.setMacAddresses(mpfdi.getFormDataPart("macAddresses", List.class, null));
- req.setOsName(mpfdi.getFormDataPart("osName", String.class, null));
-
- return createFromRequest(req, bsc);
- }
-
- /**
- * Create a new License file based in a previous one
- *
- * @param request
- * @param bsc
- * @return
- * @throws IOException
- * @throws SeCurisServiceException
- * @throws SeCurisException
- */
- @POST
- @Path("/renew")
- @Consumes(MediaType.APPLICATION_JSON)
- //TODO: Enable this: @Securable
- @Produces({
- MediaType.APPLICATION_JSON
- })
- @Transactional
- public Response renewFromPreviousLicense(LicenseBean previousLic, @Context BasicSecurityContext bsc) throws IOException, SeCurisServiceException, SeCurisException {
- LOG.info("Request to get license: {}", previousLic);
-
- Map<String, Object> metadata = getLicenseMetadata(previousLic);
- License licDB = getLicenseData(previousLic);
-
- Date expirationDate = licDB.getExpirationDate();
- String licenseTypeCode = licDB.getPack().getLicenseType().getCode();
- String licenseCode = licDB.getCode();
- LicenseBean lic = licenseGenerator.generateLicense(previousLic, metadata, expirationDate, licenseTypeCode, licenseCode);
- return Response.ok(lic).build();
- }
-
- /**
- * Returns a new License file in JSON format based in a previous license
- * @param mpfdi
- * @param bsc
- * @return
- * @throws IOException
- * @throws SeCurisServiceException
- * @throws SeCurisException
- */
- @POST
- @Path("/renew")
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- @Securable
- @Produces({
- MediaType.APPLICATION_JSON
- })
- @Transactional
- @SuppressWarnings("unchecked")
- public Response renewFromLicenseFile(MultipartFormDataInput mpfdi, @Context BasicSecurityContext bsc) throws IOException, SeCurisServiceException, SeCurisException {
- LicenseBean lic = new LicenseBean();
- // TODO: Add more license parameters
- lic.setAppCode(mpfdi.getFormDataPart("appCode", String.class, null));
- lic.setArch(mpfdi.getFormDataPart("arch", String.class, null));
- lic.setCrcLogo(mpfdi.getFormDataPart("crcLogo", String.class, null));
- lic.setCustomerCode(mpfdi.getFormDataPart("customerCode", String.class, null));
- lic.setMacAddresses(mpfdi.getFormDataPart("macAddresses", List.class, null));
- lic.setOsName(mpfdi.getFormDataPart("osName", String.class, null));
-
- return createFromRequest(lic, bsc);
- }
-
-
-
@PUT
@POST
--
Gitblit v1.3.2