Issue 16796 jwt pp auth 2 #19273

freddyucv · 2020-09-16T16:06:31Z

Use JWT to authenticate in Push Publish and Integrity Checker

This reverts commit d06b4af.

…auth_2

dev-dotcms · 2020-09-25T22:52:22Z

...tup/runonce/Task05390RemoveEndpointIdForeignKeyInIntegrityResolverTablesIntegrationTest.java

+
+    private void checkColumnSize(final String tableName) throws SQLException {
+        final Connection connection = DbConnectionFactory.getConnection();
+        final ResultSet resultSet = DotDatabaseMetaData.getColumnsMetaData(connection, tableName);


Codacy found an issue: Ensure that resources like this ResultSet object are closed after use

dev-dotcms · 2020-09-25T22:52:23Z

...tmarketing/startup/runonce/Task05390RemoveEndpointIdForeignKeyInIntegrityResolverTables.java

+    }
+
+    private void dropConstraint(final String tableName, final String constraintName) throws DotDataException {
+        DotConnect dc = new DotConnect();


Codacy found an issue: Avoid variables with short names like dc

dev-dotcms · 2020-09-25T22:52:24Z

dotCMS/src/main/java/com/dotcms/rest/BundlePublisherResource.java

+import com.dotcms.publisher.pusher.AuthCredentialPushPublishUtil;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;


Codacy found an issue: Avoid unused imports such as 'javax.ws.rs'

dev-dotcms · 2020-09-25T22:52:26Z

...tup/runonce/Task05390RemoveEndpointIdForeignKeyInIntegrityResolverTablesIntegrationTest.java

+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;


Codacy found an issue: Avoid unused imports such as 'java.util.Set'

dev-dotcms · 2020-09-25T22:52:27Z

...tup/runonce/Task05390RemoveEndpointIdForeignKeyInIntegrityResolverTablesIntegrationTest.java

+import java.util.Set;
+
+import static com.dotcms.util.CollectionsUtils.list;
+import static com.dotcms.util.CollectionsUtils.map;


Codacy found an issue: Avoid unused imports such as 'com.dotcms.util.CollectionsUtils.map'

dev-dotcms · 2020-09-25T22:52:28Z

dotCMS/src/main/java/com/dotcms/integritycheckers/IntegrityChecker.java

     * @throws DotDataException
     * @throws DotSecurityException
     */
-    public void executeFix(final String endpointId) throws DotDataException, DotSecurityException;
+    public void executeFix(final String key) throws DotDataException, DotSecurityException;


Codacy found an issue: Unnecessary modifier 'public' on method 'executeFix': the method is declared in an interface type

dev-dotcms · 2020-09-25T22:52:29Z

dotCMS/src/main/java/com/dotcms/rest/BundlePublisherResource.java

+		return String.format("bundle_%d.tar.gz", System.currentTimeMillis());
+	}
+
+	private boolean isAdmin(final User user) {


Codacy found an issue: Avoid unused private methods such as 'isAdmin(User)'.

dev-dotcms · 2020-09-25T22:52:31Z

dotCMS/src/main/java/com/dotcms/rest/IntegrityResource.java

+
+                    processing = false;
+
+                    InputStream zipFile = response.readEntity(InputStream.class);


Codacy found an issue: Ensure that resources like this InputStream object are closed after use

dev-dotcms · 2020-09-25T22:52:32Z

dotCMS/src/main/java/com/dotcms/rest/IntegrityResource.java

-	 * @throws JSONException
-	 *             An error occurred when generating the JSON response.
-	 */
+    private String getRemoteIP(@Context HttpServletRequest request) {


Codacy found an issue: Avoid unused private methods such as 'getRemoteIP(HttpServletRequest)'.

dev-dotcms · 2020-09-25T22:52:33Z

dotCMS/src/main/java/com/dotcms/auth/providers/jwt/factories/ApiTokenAPI.java

@@ -5,6 +5,7 @@
 import com.dotcms.business.CloseDBIfOpened;
 import com.dotcms.business.WrapInTransaction;
 import com.dotcms.enterprise.cluster.ClusterFactory;
+import com.dotcms.publisher.pusher.PushPublisher;


Codacy found an issue: Avoid unused imports such as 'com.dotcms.publisher.pusher.PushPublisher'

dev-dotcms · 2020-09-25T22:52:34Z

dotCMS/src/main/java/com/dotcms/rest/IntegrityResource.java

+                            //Setting the process status
+                            setStatus(session, endpoint.getId(), ProcessStatus.CANCELLED, null);
+                            Logger.debug(IntegrityResource.class, "Requested interruption of the integrity checking process by the user.", e);
+                            throw new RuntimeException("Requested interruption of the integrity checking process by the user.", e);


Codacy found an issue: Avoid throwing raw exception types.

dev-dotcms · 2020-09-25T22:52:36Z

dotCMS/src/main/java/com/dotcms/rest/IntegrityResource.java

+                    } catch (Exception e) {
+
+                        //Special handling if the thread was interrupted
+                        if (e instanceof InterruptedException) {


Codacy found an issue: An instanceof check is being performed on the caught exception. Create a separate catch clause for this exception type.

dev-dotcms · 2020-09-25T22:52:37Z

...tup/runonce/Task05390RemoveEndpointIdForeignKeyInIntegrityResolverTablesIntegrationTest.java

+        dc.addParam("remote_identifier" + System.currentTimeMillis());
+        dc.addParam("html_page" + System.currentTimeMillis());
+        dc.addParam(remoteIP);
+        dc.addParam(new Long("1"));


Codacy found an issue: Avoid instantiating Long objects.Call Long.valueOf() instead

dev-dotcms · 2020-09-25T22:52:38Z

...tup/runonce/Task05390RemoveEndpointIdForeignKeyInIntegrityResolverTablesIntegrationTest.java

+
+    private String insertPublishingEndPoint() throws DotDataException {
+
+        DotConnect dc = new DotConnect();


Codacy found an issue: Avoid variables with short names like dc

dev-dotcms · 2020-09-25T22:52:39Z

dotCMS/src/main/java/com/dotcms/publisher/pusher/AuthCredentialPushPublishUtil.java

+public enum AuthCredentialPushPublishUtil {
+    INSTANCE;
+
+    private final String BEARER = "Bearer ";


Codacy found an issue: This final field could be made static

dev-dotcms · 2020-09-25T22:52:40Z

dotCMS/src/main/java/com/dotcms/rest/PushPublishResourceUtil.java

+import com.liferay.portal.model.User;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;


Codacy found an issue: Avoid unused imports such as 'javax.servlet.http.HttpServletResponse'

dev-dotcms · 2020-09-25T22:52:41Z

dotCMS/src/main/java/com/dotcms/rest/RestEndPointIPUtil.java

+/**
+ * Provide util methods to get remote or local IP from {@link HttpServletRequest}
+ */
+public class RestEndPointIPUtil {


Codacy found an issue: All methods are static. Consider using a utility class instead. Alternatively, you could add a private constructor or make the class abstract to silence this warning.

dev-dotcms · 2020-09-25T22:52:41Z

...tup/runonce/Task05390RemoveEndpointIdForeignKeyInIntegrityResolverTablesIntegrationTest.java

+
+        task05390RemoveEndpointIdForeignKeyInIntegrityResolverTables.executeUpgrade();
+
+        insertFolderIntegrityResolver("anyIP");


Codacy found an issue: The String literal "anyIP" appears 5 times in this file; the first occurrence is on line 54

dev-dotcms · 2020-09-25T22:52:42Z

dotCMS/src/main/java/com/dotcms/rest/api/v1/system/ConfigurationResource.java

-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.*;


Codacy found an issue: Avoid unused imports such as 'javax.ws.rs'

dev-dotcms · 2020-09-25T22:52:43Z

dotCMS/src/main/java/com/dotcms/rest/PushPublishResourceUtil.java

+import com.dotcms.util.CollectionsUtils;
+import com.dotcms.util.HttpRequestDataUtil;
+import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.UtilMethods;


Codacy found an issue: Avoid unused imports such as 'com.dotmarketing.util.UtilMethods'

dev-dotcms · 2020-09-25T22:52:45Z

dotCMS/src/main/java/com/dotcms/rest/BundlePublisherResource.java

+	@WrapInTransaction
+	private Bundle publishBundle(final boolean forcePush,
+								 final HttpServletRequest request,
+								 final String remoteIP) throws Exception {


Codacy found an issue: A method/constructor should not explicitly throw java.lang.Exception

dev-dotcms · 2020-09-25T22:52:46Z

dotCMS/src/main/java/com/dotcms/rest/BundlePublisherResource.java

+			@QueryParam("FORCE_PUSH")  final boolean forcePush,
+			@Context final HttpServletRequest  request,
+			@Context final HttpServletResponse response
+	) throws Exception {


Codacy found an issue: A method/constructor should not explicitly throw java.lang.Exception

dev-dotcms · 2020-09-25T22:52:47Z

dotCMS/src/main/java/com/dotcms/rest/IntegrityResource.java

-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Client;
+import javax.ws.rs.*;


Codacy found an issue: Avoid unused imports such as 'javax.ws.rs'

dev-dotcms · 2020-09-25T22:52:48Z

dotCMS/src/main/java/com/dotcms/rest/PushPublishResourceUtil.java

+/**
+ * Provide util method for {@link IntegrityResource} and {@link BundleResource} classes
+ */
+public class PushPublishResourceUtil {


Codacy found an issue: All methods are static. Consider using a utility class instead. Alternatively, you could add a private constructor or make the class abstract to silence this warning.

dev-dotcms · 2020-09-25T22:52:49Z

...tup/runonce/Task05390RemoveEndpointIdForeignKeyInIntegrityResolverTablesIntegrationTest.java

+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;


Codacy found an issue: Avoid unused imports such as 'java.util.Map'

… content (#20346) * #19723: Bringing hotfix (dotCMS/support@8331dd7) into core. * #19273: Implemented suggested code changes to make limit param immutable * Undo accidental merge of ext-properties.

jdotcms and others added 30 commits March 9, 2020 09:30

#16796 adding fixes and comments to support the jwt on pp

435f564

#16796 merge

53df03a

#16796 Fixing error when some parameters not come in the request

9b153c6

#16796 Testing

48e4730

#16796 refactoring/testing

d06b4af

#16796 testing

1d1727a

#16796 refactorign

1aa6ff7

#16796 Refactoring

338fb56

Revert "#16796 refactoring/testing"

04ed141

This reverts commit d06b4af.

refactoring

1b4ae1b

#16796 Fixing Test

80f78a9

#16796 Fixing PP error

029e9b3

#16796 Sending JWT token in PP request

f1d5ddf

Merge remote-tracking branch 'origin/master' into issue-16796-jwt-pp-…

6fc5875

…auth_2

#16796 Removing receiver configuration from jsp

8ddfa85

#18690 Using JWT token in integrity checker

c57992e

merge

2922890

#16796 Show invalid token message when IC fails with a invalid token

689c942

#16796 Removing end poitn id from fix conflicts end point

4b5791c

#16796 Adding Task Upgrade

676a7d0

#16796 Not show token when it is invalid or expired

5cfcc67

merge

ccc5b33

#16796 Allow switch between old way token and JWT token in Push Publish

3f04c74

#16796 Allow switch between old way token and JWT token in Push Publish

1ee66ac

#16796 Postman Testing

0c0cdfc

#16796 Postman Testing

1a11286

#16796 Testing

1a49e31

#16796

5a605e4

#16796 testing

5b529f8

#16796 merge

6e2780c

dsilvam merged commit 7804256 into master Sep 25, 2020

delete-merged-branch bot deleted the issue-16796-jwt-pp-auth_2 branch September 25, 2020 22:48

dev-dotcms reviewed Sep 25, 2020

View reviewed changes

swicken-dotcms added a commit that referenced this pull request Jun 1, 2021

#19273: Implemented suggested code changes to make limit param immutable

f9672ae

swicken-dotcms added a commit that referenced this pull request Jun 1, 2021

#19273: Pull master and resolve conflicts

8508de5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 16796 jwt pp auth 2 #19273

Issue 16796 jwt pp auth 2 #19273

freddyucv commented Sep 16, 2020 •

edited

Loading

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020

dev-dotcms Sep 25, 2020


		processing = false;

		InputStream zipFile = response.readEntity(InputStream.class);


		private String insertPublishingEndPoint() throws DotDataException {

		DotConnect dc = new DotConnect();


		task05390RemoveEndpointIdForeignKeyInIntegrityResolverTables.executeUpgrade();

		insertFolderIntegrityResolver("anyIP");

Issue 16796 jwt pp auth 2 #19273

Issue 16796 jwt pp auth 2 #19273

Conversation

freddyucv commented Sep 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

freddyucv commented Sep 16, 2020 •

edited

Loading