forked from eclipse-tractusx/traceability-foss
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #604 from abi231002/main
fixed: fix Log Injection CWE-117
- Loading branch information
Showing
4 changed files
with
163 additions
and
8 deletions.
There are no files selected for viewing
40 changes: 40 additions & 0 deletions
40
tx-backend/src/main/java/org/eclipse/tractusx/traceability/common/model/SecurityUtils.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /******************************************************************************** | ||
| * 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 | ||
| ********************************************************************************/ | ||
|
|
||
| package org.eclipse.tractusx.traceability.common.model; | ||
|
|
||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class SecurityUtils { | ||
|
|
||
| public static String sanitize(String unSanitizedInput) { | ||
| return unSanitizedInput.replaceAll("\r\n|\r|\n", " "); | ||
| } | ||
|
|
||
| public static List<String> sanitize(List<String> unSanitizedList) { | ||
| List<String> cleanListOfAffectedItems = new ArrayList<>(); | ||
| for (String affectedItem : unSanitizedList) { | ||
| String cleanAffectedItem = sanitize(affectedItem); | ||
| cleanListOfAffectedItems.add(cleanAffectedItem); | ||
| } | ||
| return cleanListOfAffectedItems; | ||
| } | ||
| } |
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
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
84 changes: 84 additions & 0 deletions
84
.../org/eclipse/tractusx/traceability/infrastructure/edc/model/EdcNotificationModelTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /******************************************************************************** | ||
| * 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 | ||
| ********************************************************************************/ | ||
| package org.eclipse.tractusx.traceability.infrastructure.edc.model; | ||
|
|
||
| import org.eclipse.tractusx.traceability.qualitynotification.infrastructure.edc.model.EDCNotificationContent; | ||
| import org.eclipse.tractusx.traceability.qualitynotification.infrastructure.edc.model.EDCNotificationHeader; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
|
|
||
| public class EdcNotificationModelTest { | ||
|
|
||
| @Test | ||
| public void testToStringEDCNotificationHeader() { | ||
|
|
||
| //GIVEN | ||
| EDCNotificationHeader header = new EDCNotificationHeader( | ||
| "12345", "SenderBPN", "Sender\nAddress", "RecipientBPN", | ||
| "Classification", "Severity", "Related\nNotificationId", | ||
| "Status", "2023-09-22", "MessageId" | ||
| ); | ||
|
|
||
| String expected = "EDCNotificationHeader{" + | ||
| "notificationId='12345', " + | ||
| "senderBPN='SenderBPN', " + | ||
| "senderAddress='Sender Address', " + | ||
| "recipientBPN='RecipientBPN', " + | ||
| "classification='Classification', " + | ||
| "severity='Severity', " + | ||
| "relatedNotificationId='Related NotificationId', " + | ||
| "status='Status', " + | ||
| "targetDate='2023-09-22', " + | ||
| "messageId='MessageId'}"; | ||
|
|
||
| //WHEN | ||
| String actual = header.toString(); | ||
|
|
||
| //THEN | ||
| assertEquals(expected, actual); | ||
| } | ||
|
|
||
| @Test | ||
| public void testToStringEDCNotificationContent() { | ||
|
|
||
| //GIVEN | ||
| List<String> listOfAffectedItems = new ArrayList<>(Arrays.asList("Item1\nItem2", "Item3", "Item4\r\nItem5")); | ||
|
|
||
| EDCNotificationContent content = new EDCNotificationContent( | ||
| "Information\nwith\nline\nbreaks", listOfAffectedItems | ||
| ); | ||
|
|
||
| String expected = "EDCNotificationContent{" + | ||
| "information='Information with line breaks', " + | ||
| "listOfAffectedItems=[Item1 Item2, Item3, Item4 Item5]" + | ||
| "}"; | ||
|
|
||
| //WHEN | ||
| String actual = content.toString(); | ||
|
|
||
| //THEN | ||
| assertEquals(expected, actual); | ||
| } | ||
| } |