Skip to content

TH2-4347 vulnerabilities fix #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Jan 31, 2023
Merged

TH2-4347 vulnerabilities fix #22

merged 5 commits into from
Jan 31, 2023

Conversation

@fiodar-r
Copy link
Contributor

@fiodar-r fiodar-r commented Jan 26, 2023

No description provided.

@fiodar-r fiodar-r marked this pull request as ready for review January 27, 2023 08:28
Nikita-Smirnov-Exactpro
Nikita-Smirnov-Exactpro reviewed Jan 30, 2023
View reviewed changes
src/main/java/com/exactpro/th2/codec/csv/CodecFactory.java Outdated
@@ -0,0 +1,76 @@
/*
* Copyright 2022 Exactpro (Exactpro Systems Limited)
Copy link
Member

@Nikita-Smirnov-Exactpro Nikita-Smirnov-Exactpro Jan 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2023

Suggested change
* Copyright 2022 Exactpro (Exactpro Systems Limited)
* Copyright 2023 Exactpro (Exactpro Systems Limited)

src/main/java/com/exactpro/th2/codec/csv/CsvCodec.java Outdated
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2020 Exactpro (Exactpro Systems Limited)
* Copyright 2020-2022 Exactpro (Exactpro Systems Limited)
Copy link
Member

@Nikita-Smirnov-Exactpro Nikita-Smirnov-Exactpro Jan 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Copyright 2020-2022 Exactpro (Exactpro Systems Limited)
* Copyright 2020-2023 Exactpro (Exactpro Systems Limited)

src/main/java/com/exactpro/th2/codec/csv/CsvCodec.java
if (!anyMessage.hasRawMessage()) {
LOGGER.error("Message should either have a raw or parsed message but has nothing: {}", anyMessage);
continue;
}
Copy link
Member

@Nikita-Smirnov-Exactpro Nikita-Smirnov-Exactpro Jan 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add protocol check. Codec should decode / encode message with empty or csv (case insensitive) protocol

src/main/java/com/exactpro/th2/codec/csv/cfg/CsvCodecConfiguration.java Outdated
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2020 Exactpro (Exactpro Systems Limited)
* Copyright 2020-2022 Exactpro (Exactpro Systems Limited)
Copy link
Member

@Nikita-Smirnov-Exactpro Nikita-Smirnov-Exactpro Jan 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Copyright 2020-2022 Exactpro (Exactpro Systems Limited)
* Copyright 2020-2023 Exactpro (Exactpro Systems Limited)

@OptimumCode
Copy link
Contributor

OptimumCode commented Jan 30, 2023

@Nikita-Smirnov-Exactpro @Xanclry Hi, I don't quite understand why are we doing this PR into the master. As I can see the th2-4347 branch is based on the dev branch. Why don't we merge those changes into dev and then merge dev into master?

@Nikita-Smirnov-Exactpro
Copy link
Member

Nikita-Smirnov-Exactpro commented Jan 30, 2023

@Nikita-Smirnov-Exactpro @Xanclry Hi, I don't quite understand why are we doing this PR into the master. As I can see the th2-4347 branch is based on the dev branch. Why don't we merge those changes into dev and then merge dev into master?

We would like to push this changes ASAP

@OptimumCode
Copy link
Contributor

OptimumCode commented Jan 30, 2023

I understand. Let's switch the base branch to dev. Merge changes into dev and then merge dev into the master.
Changes looks good to me
@Nikita-Smirnov-Exactpro If you don't mind I will change the base branch and submit the approval for merge

@fiodar-r fiodar-r changed the base branch from master to dev January 31, 2023 11:13
@fiodar-r fiodar-r merged commit 9b89643 into dev Jan 31, 2023
@Nikita-Smirnov-Exactpro Nikita-Smirnov-Exactpro deleted the th2-4347-vulnerabilities branch January 31, 2023 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Nikita-Smirnov-Exactpro Nikita-Smirnov-Exactpro Nikita-Smirnov-Exactpro approved these changes

@OptimumCode OptimumCode Awaiting requested review from OptimumCode

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@fiodar-r @OptimumCode @Nikita-Smirnov-Exactpro @ak49630