fixed: fix Log Injection CWE-117 #604
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| package org.eclipse.tractusx.traceability.common.model; | ||
|
|
||
|
|
||
| public class EDC { |
There was a problem hiding this comment.
EDC means Eclipse Dataspace Connector. This class should have a security related name.
Suggested change
| public class EDC { | |
| public class SecurityUtils { |
|
|
||
| public class EDC { | ||
|
|
||
| public static String sanitizer(String unsanitizedInput) { |
There was a problem hiding this comment.
Suggested change
| public static String sanitizer(String unsanitizedInput) { | |
| public static String sanitize(String unsanitizedInput) { |
Comment on lines
35
to
46
| public String toString() { | ||
| String cleanInformation = EDC.sanitizer(information); | ||
| List<String> cleanListOfAffectedItems = new ArrayList<>(); | ||
| for (String AffectedItems : listOfAffectedItems) { | ||
| String cleanAffectedItem = EDC.sanitizer(AffectedItems); | ||
| cleanListOfAffectedItems.add(cleanAffectedItem); | ||
| } | ||
| return "EDCNotificationContent{" + | ||
| "information='" + cleanInformation + '\'' + | ||
| ", listOfAffectedItems=" + cleanListOfAffectedItems + | ||
| '}'; | ||
| } |
There was a problem hiding this comment.
Suggested change
| public String toString() { | |
| String cleanInformation = EDC.sanitizer(information); | |
| List<String> cleanListOfAffectedItems = new ArrayList<>(); | |
| for (String AffectedItems : listOfAffectedItems) { | |
| String cleanAffectedItem = EDC.sanitizer(AffectedItems); | |
| cleanListOfAffectedItems.add(cleanAffectedItem); | |
| } | |
| return "EDCNotificationContent{" + | |
| "information='" + cleanInformation + '\'' + | |
| ", listOfAffectedItems=" + cleanListOfAffectedItems + | |
| '}'; | |
| } | |
| public String toString() { | |
| List<String> cleanListOfAffectedItems = new ArrayList<>(); | |
| for (String affectedItem : listOfAffectedItems) { | |
| String cleanAffectedItem = EDC.sanitizer(AffectedItems); | |
| cleanListOfAffectedItems.add(cleanAffectedItem); | |
| } | |
| return "EDCNotificationContent{" + | |
| "information='" + EDC.sanitizer(information) + '\'' + | |
| ", listOfAffectedItems=" + cleanListOfAffectedItems + | |
| '}'; | |
| } |
...actusx/traceability/qualitynotification/infrastructure/edc/model/EDCNotificationContent.java
Outdated
Show resolved
Hide resolved
| @Override | ||
| public String toString() { | ||
| return "EDCNotificationHeader{" + | ||
| "notificationId='" + EDC.sanitizer(notificationId) + '\'' + |
There was a problem hiding this comment.
Add the class as static import so the class name is not visible in each line
...ava/org/eclipse/tractusx/traceability/infrastructure/edc/model/EdcNotificationModelTest.java
Show resolved
Hide resolved
...ava/org/eclipse/tractusx/traceability/infrastructure/edc/model/EdcNotificationModelTest.java
Show resolved
Hide resolved
...ava/org/eclipse/tractusx/traceability/infrastructure/edc/model/EdcNotificationModelTest.java
Show resolved
Hide resolved
| } | ||
|
|
||
| @Test | ||
| public void testToString() { |
There was a problem hiding this comment.
Please insert same //GIVEN //WHEN //THEN pattern as above.
| public class EdcNotificationModelTest { | ||
|
|
||
| @Test | ||
| public void testToStringWithRegex() { |
There was a problem hiding this comment.
Where is the regex in this method?
Comment on lines
1
to
20
| /******************************************************************************** | ||
| * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) | ||
| * Copyright (c) 2022, 2023 ZF Friedrichshafen AG | ||
| * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ********************************************************************************/ |
There was a problem hiding this comment.
Suggested change
| /******************************************************************************** | |
| * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) | |
| * Copyright (c) 2022, 2023 ZF Friedrichshafen AG | |
| * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation | |
| * | |
| * See the NOTICE file(s) distributed with this work for additional | |
| * information regarding copyright ownership. | |
| * | |
| * This program and the accompanying materials are made available under the | |
| * terms of the Apache License, Version 2.0 which is available at | |
| * https://www.apache.org/licenses/LICENSE-2.0. | |
| * | |
| * Unless required by applicable law or agreed to in writing, software | |
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | |
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | |
| * License for the specific language governing permissions and limitations | |
| * under the License. | |
| * | |
| * SPDX-License-Identifier: Apache-2.0 | |
| ********************************************************************************/ | |
| /******************************************************************************** | |
| * Copyright (c) 2023 Contributors to the Eclipse Foundation | |
| * | |
| * See the NOTICE file(s) distributed with this work for additional | |
| * information regarding copyright ownership. | |
| * | |
| * This program and the accompanying materials are made available under the | |
| * terms of the Apache License, Version 2.0 which is available at | |
| * https://www.apache.org/licenses/LICENSE-2.0. | |
| * | |
| * Unless required by applicable law or agreed to in writing, software | |
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | |
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | |
| * License for the specific language governing permissions and limitations | |
| * under the License. | |
| * | |
| * SPDX-License-Identifier: Apache-2.0 | |
| ********************************************************************************/ |
Please use this as a copyright header.
|
|
||
| public static List<String> sanitizeList(List<String> unSanitizedList) { | ||
| List<String> cleanListOfAffectedItems = new ArrayList<>(); | ||
| for (String affectedItems : unSanitizedList) { |
There was a problem hiding this comment.
Suggested change
| for (String affectedItems : unSanitizedList) { | |
| for (String affectedItem : unSanitizedList) { |
| return unSanitizedInput.replaceAll("\r\n|\r|\n", " "); | ||
| } | ||
|
|
||
| public static List<String> sanitizeList(List<String> unSanitizedList) { |
There was a problem hiding this comment.
Suggested change
| public static List<String> sanitizeList(List<String> unSanitizedList) { | |
| public static List<String> sanitizeList(List<String> unsanitizedList) { |
| return unSanitizedInput.replaceAll("\r\n|\r|\n", " "); | ||
| } | ||
|
|
||
| public static List<String> sanitizeList(List<String> unSanitizedList) { |
There was a problem hiding this comment.
Suggested change
| public static List<String> sanitizeList(List<String> unSanitizedList) { | |
| public static List<String> sanitize(List<String> unSanitizedList) { |
I think it would be better to just overload the method with new parameters instead of renaming it. What is your take on this?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.