Merge pull request #280 from madhawap/master

Added username field to the device certificate DB and related changes

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java

@@ -55,7 +55,11 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
         try {
             conn = this.getConnection();
             stmt = conn.prepareStatement(
-                    "INSERT INTO DM_DEVICE_CERTIFICATE (SERIAL_NUMBER, CERTIFICATE, TENANT_ID) VALUES (?,?,?)");
+                    "INSERT INTO DM_DEVICE_CERTIFICATE (SERIAL_NUMBER, CERTIFICATE, TENANT_ID, USERNAME)"
+                            + " VALUES (?,?,?,?)");
+            PrivilegedCarbonContext threadLocalCarbonContext = PrivilegedCarbonContext.
+                    getThreadLocalCarbonContext();
+            String username = threadLocalCarbonContext.getUsername();
             for (Certificate certificate : certificates) {
                 String serialNumber = certificate.getSerial();
                 if (serialNumber == null || serialNumber.isEmpty()) {
@@ -67,6 +71,7 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
                 stmt.setString(1, serialNumber);
                 stmt.setObject(2, byteArrayInputStream);
                 stmt.setInt(3, certificate.getTenantId());
+                stmt.setString(4, username);
                 stmt.addBatch();
             }
             stmt.executeBatch();
@@ -89,8 +94,8 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
         try {
             conn = this.getConnection();
             String query =
-                    "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID FROM DM_DEVICE_CERTIFICATE WHERE SERIAL_NUMBER = ?" +
+                    "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM"
-                    " AND TENANT_ID = ? ";
+                            + " DM_DEVICE_CERTIFICATE WHERE SERIAL_NUMBER = ? AND TENANT_ID = ? ";
             stmt = conn.prepareStatement(query);
             stmt.setString(1, serialNumber);
             stmt.setInt(2, tenantId);
@@ -102,6 +107,7 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
                 certificateResponse.setCertificate(certificateBytes);
                 certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
                 certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
                 CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
                 break;
             }
@@ -128,8 +134,8 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
         try {
             conn = this.getConnection();
             String query =
-                    "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID FROM DM_DEVICE_CERTIFICATE WHERE SERIAL_NUMBER LIKE ?" +
+                    "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM DM_DEVICE_CERTIFICATE "
-                    " AND TENANT_ID = ? ";
+                            + "WHERE SERIAL_NUMBER LIKE ? AND TENANT_ID = ? ";
             stmt = conn.prepareStatement(query);
             stmt.setString(1, "%" + serialNumber + "%");
             stmt.setInt(2, tenantId);
@@ -140,6 +146,7 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
                 byte [] certificateBytes = resultSet.getBytes("CERTIFICATE");
                 certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
                 certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
                 CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
                 certificates.add(certificateResponse);
             }
@@ -164,8 +171,8 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             Connection conn = this.getConnection();
-            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID FROM DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? " +
+            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM "
-                         "ORDER BY ID DESC LIMIT ?,?";
+                    + "DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC LIMIT ?,?";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             stmt.setInt(2, request.getStartIndex());
@@ -178,6 +185,7 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
                 byte [] certificateBytes = resultSet.getBytes("CERTIFICATE");
                 certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
                 certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
                 CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
                 certificates.add(certificateResponse);
                 resultCount++;
@@ -204,8 +212,8 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             Connection conn = this.getConnection();
-            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID FROM DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? " +
+            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME"
-                         "ORDER BY ID DESC";
+                    + " FROM DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             resultSet = stmt.executeQuery();
@@ -215,6 +223,7 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
                 byte [] certificateBytes = resultSet.getBytes("CERTIFICATE");
                 certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
                 certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
                 CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
                 certificates.add(certificateResponse);
             }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dto/CertificateResponse.java

@@ -56,6 +56,17 @@ public class CertificateResponse {
     @ApiModelProperty(name = "certificateVersion", value = "The version of the certificate", required = true)
     int certificateVersion;
 
+    @ApiModelProperty(name ="username", value="username of the logged user", required = true)
+    String username;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
     public long getNotAfter() {
         return notAfter;
     }

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/CertificateAuthenticator.java

@@ -129,10 +129,9 @@ public class CertificateAuthenticator implements WebappAuthenticator {
                 isEmpty()) {
             authenticationInfo.setTenantId(certificateResponse.getTenantId());
             authenticationInfo.setStatus(Status.CONTINUE);
-            authenticationInfo.setUsername(certificateResponse.getCommonName());
+            authenticationInfo.setUsername(certificateResponse.getUsername());
             try {
-                authenticationInfo.setTenantDomain(Utils.
+                authenticationInfo.setTenantDomain(Utils.getTenantDomain(
-                                                                getTenantDomain(
                                                                         certificateResponse.getTenantId()));
             } catch (AuthenticationException e) {
                 authenticationInfo.setStatus(Status.FAILURE);

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql

@@ -22,6 +22,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
       SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
     	CERTIFICATE                  BLOB DEFAULT NULL,
     	TENANT_ID INTEGER DEFAULT 0,
+    	USERNAME  VARCHAR(500) DEFAULT NULL,
     	PRIMARY KEY (ID)
 );
 

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql

@@ -22,6 +22,7 @@ CREATE TABLE DM_DEVICE_CERTIFICATE (
       SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
     	CERTIFICATE                  VARBINARY(max) DEFAULT NULL,
     	TENANT_ID INTEGER DEFAULT 0,
+    	USERNAME  VARCHAR(500) DEFAULT NULL,
     	PRIMARY KEY (ID)
 );
 

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql

@@ -11,6 +11,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
       SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
     	CERTIFICATE                  BLOB DEFAULT NULL,
     	TENANT_ID INTEGER DEFAULT 0,
+    	USERNAME  VARCHAR(500) DEFAULT NULL,
     	PRIMARY KEY (ID)
 )ENGINE = InnoDB;
 

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql

@@ -50,6 +50,7 @@ CREATE TABLE DM_DEVICE_CERTIFICATE (
   SERIAL_NUMBER         VARCHAR2(500) DEFAULT NULL,
   CERTIFICATE           BLOB DEFAULT NULL,
   TENANT_ID NUMBER(10) DEFAULT 0,
+  USERNAME  VARCHAR2(500) DEFAULT NULL,
   PRIMARY KEY (ID)
 )
 /

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql

@@ -9,7 +9,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
   ID                    BIGSERIAL NOT NULL PRIMARY KEY,
   SERIAL_NUMBER         VARCHAR(500) DEFAULT NULL,
   CERTIFICATE           BYTEA DEFAULT NULL,
-  TENANT_ID INTEGER DEFAULT 0
+  TENANT_ID INTEGER DEFAULT 0,
+  USERNAME  VARCHAR(500) DEFAULT NULL
 );
 
 CREATE TABLE IF NOT EXISTS  DM_DEVICE (