Skip to content
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.

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

Feature/urlparser improve3 pr2 #2646

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

MarekUniq
Copy link
Contributor

1. Compatibility with libpq is improved regarding URL syntax and resolving url values

1.1. user and password are supported

Complete syntax:
jdbc:postgresql://[[user][:password]@][host1[:port1][,host2[:port2]][,...]][/database][?property1=value1[&property2=value2][&...]]

URL may include:

user (Optional) is the user to connect. Defaults to operating system username.
password (Optional) is the password to connect. No default value.

1.2. property passfile is supported

Example:

Properties props = new Properties();
PGProperty.PASSFILE.set(props, "/mydir/mypass");
Connection conn = DriverManager.getConnection(url, props);

1.3. Code is more clear regarding Properties override rules (source and result are logged at FINE logging level)

There are multiple sources for connection properties. If same property is specified in multiple sources then highest priority source is used. Priority list is here:

1) URL arguments (values after `?` mark)
2) URL values (values before `?` mark)
3) Properties given to `DriverManager.getConnection()`
4) values provided by `service` (from resource `.pg_service.conf`)
5) values in Java System Properties
6) values in Operating System environment
7) values from driverconfig file(s) (`org/postgresql/driverconfig.properties`)
8) global defaults (`dbname`, `host`, `pgpass`, `port`, `user`)

1.4. References

Related to: #2260 #2278 #2398 #2393 #2395 #2424 #2569 #2641 #2644

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?

New Feature Submissions:

  1. Does your submission pass tests?
  2. Does ./gradlew autostyleCheck checkstyleAll pass ?
  3. Have you added your new test classes to an existing test suite in alphabetical order?

Changes to Existing Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you successfully run tests with your changes locally?

@gitguardian
Copy link

gitguardian bot commented Oct 20, 2022

⚠️ GitGuardian has uncovered 13 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
- PostgreSQL Credentials 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Password 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Password 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- PostgreSQL Credentials 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Password 77f14ab pgjdbc/src/test/resources/pg_service/pgservicefileProps.conf View secret
- Generic Password 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Database Assignment 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Password 77f14ab pgjdbc/src/test/resources/pg_service/pgservicefileProps.conf View secret
- Generic Password 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Password 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Password 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Password 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
- Generic Password 77f14ab pgjdbc/src/test/java/org/postgresql/jdbcurlresolver/JdbcUrlResolverTest.java View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

@MarekUniq
Copy link
Contributor Author

@davecramer
Hi! What are merge plans? Should I resolve conflicts now or at a later time?

@davecramer
Copy link
Member

@MarekUniq currently my plans are 1) merge in the issue with longs #2710 will be reopened and merged. A release with this fix will be released.
Then we plan on merging in #2635 and releasing as a new major version.

I would hold off rebasing until after the above happens.

Thanks for your patience

@MarekUniq
Copy link
Contributor Author

@davecramer
Hi! The following pull requests are merged: #2710 #2635.
Any plans for this one?

@MarekUniq
Copy link
Contributor Author

@davecramer Hi! What are merge plans?

@androa
Copy link

androa commented Apr 18, 2024

Is there any progress on merging this?

@davecramer
Copy link
Member

I'm generally in favour of this PR. It will need to be rebased.

@MarekUniq
Copy link
Contributor Author

@davecramer: I'm generally in favour of this PR. It will need to be rebased.
Rebased

@vlsi
Copy link
Member

vlsi commented May 12, 2024

@MarekUniq , the change reads +19,305 −44,408. Please make sure you include only the needed changes. There's no way we merge something that touches 44 thousand lines.

@MarekUniq
Copy link
Contributor Author

@vlsi - I agree that GitHub displayed this PR in a strange way. I saw it too. (was it a glitch or my mistake, I do not know)

But I noticed there were 5 new commits in master branch and I rebased branch feature/urlparser-improve3-pr2 again.
the change reads are back to normal now:
+2,031 −909

@vlsi
Copy link
Member

vlsi commented May 13, 2024

@MarekUniq , please rebase commits so they appear "on top of the master branch". The project uses linear history rather than merge commits.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@vlsi
Copy link
Member

vlsi commented May 15, 2024

The key question I have here is how do we test and ensure backward compatibility?

@MarekUniq
Copy link
Contributor Author

@MarekUniq , please rebase commits so they appear "on top of the master branch". The project uses linear history rather than merge commits.

@vlsi I think I can't change the order of commits anymore.
However, in case this PR will be merged, there will be a "squash merge" and then there will be only one commit in the master branch, which will appear as the last commit in the master branch. Isn't it?

@vlsi
Copy link
Member

vlsi commented May 15, 2024

What do you mean by "can't change the order of commits"? Could you please squash at your side?

@MarekUniq MarekUniq force-pushed the feature/urlparser-improve3-pr2 branch from 24c5eba to 464f9b9 Compare May 22, 2024 08:08
@MarekUniq
Copy link
Contributor Author

What do you mean by "can't change the order of commits"? Could you please squash at your side?

@vlsi Is this the result you were expecting? I did the following:

  • git merge --squash ...
  • git push --force ...

@MarekUniq MarekUniq force-pushed the feature/urlparser-improve3-pr2 branch 3 times, most recently from 464f9b9 to a611da6 Compare May 27, 2024 07:20
@MarekUniq MarekUniq force-pushed the feature/urlparser-improve3-pr2 branch from adc3c6a to e9676f2 Compare May 28, 2024 08:08
@MarekUniq MarekUniq force-pushed the feature/urlparser-improve3-pr2 branch from e9676f2 to aa26c91 Compare June 3, 2024 17:10
@MarekUniq
Copy link
Contributor Author

@davecramer @sehrope @vlsi
From my point of view, I have nothing pending or anything to add regarding this PR at this time.
Please continue with the PR review process and provide feedback or suggest necessary changes as needed.

@MarekUniq MarekUniq force-pushed the feature/urlparser-improve3-pr2 branch from aa26c91 to 0ce9844 Compare June 6, 2024 15:28
@MarekUniq MarekUniq force-pushed the feature/urlparser-improve3-pr2 branch from 0ce9844 to 9d5daeb Compare June 6, 2024 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants