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.

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

Allow using custom SSL certificates #8583

Merged
merged 48 commits into from
Mar 26, 2022
Merged

Allow using custom SSL certificates #8583

merged 48 commits into from
Mar 26, 2022

Commits on Mar 19, 2022

  1. Design the preference section for adding custom SSL certificates

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    b41dcb2 View commit details
    Browse the repository at this point in the history

  2. Inject custom certificates FXML views into the controller

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    529cef5 View commit details
    Browse the repository at this point in the history

  3. Delete unused import

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    8bfb234 View commit details
    Browse the repository at this point in the history

  4. Allow for enabling or disabling custom certificates

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    c0c0700 View commit details
    Browse the repository at this point in the history

  5. Use LocalDate instead of LocalDateTime for tracking certificate validity

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    0ad15e6 View commit details
    Browse the repository at this point in the history

  6. Populate CustomCertificateViewModel with data from SSLCertificate 

    - Added a method to map X509Certificate to SSLCertificate
    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    c586be0 View commit details
    Browse the repository at this point in the history

  7. Setup cell factory and populate the table with dummy data

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    d382212 View commit details
    Browse the repository at this point in the history

  8. Add '.cer' to StandardFileType

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    63ee23f View commit details
    Browse the repository at this point in the history

  9. Open file explorer on 'Add certificate' clicked

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    e2cb0ca View commit details
    Browse the repository at this point in the history

  10. Merge branch 'JabRef:main' into allow-custom-ssl

    @HoussemNasri
    HoussemNasri committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    17a78b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2022

  1. Copy JDK 17 truststore into project resources

    @HoussemNasri
    HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    4cf3683 View commit details
    Browse the repository at this point in the history

  2. Bump JavaFX from 17.0.2 to 18 (#8577) 

    * Bump JavaFX from 17.0.2 to 18

* Remove mac os hack for maintable
Copy Preview content and not entry

Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
    @calixtus @Siedlerchr @HoussemNasri
    2 people authored and HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    e5b9972 View commit details
    Browse the repository at this point in the history

  3. Fix missing search index dir (#8581) 

    Fixes #8579
    @Siedlerchr @HoussemNasri
    Siedlerchr authored and HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    f793ab9 View commit details
    Browse the repository at this point in the history

  4. Log user added certificates information

    @HoussemNasri
    HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    eab1d2e View commit details
    Browse the repository at this point in the history

  5. Add an alias property to SSLCertificate that is generated randomly 

    - A keystore contains a list of certificate entries, each of which is identified by a unique alias. For now, I'll generate aliases at random, but in the future, it would be better if users entered them.
    @HoussemNasri
    HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    e3e9c11 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/allow-custom-ssl' into allow-cus… 

    …tom-ssl
    @HoussemNasri
    HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    42a4f13 View commit details
    Browse the repository at this point in the history

  7. Create TrustStoreManager for truststore manipulation

    @HoussemNasri
    HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    d6a2372 View commit details
    Browse the repository at this point in the history

  8. Add SSLPreferences

    @HoussemNasri
    HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    ec92706 View commit details
    Browse the repository at this point in the history

  9. Set custom certificate preferences defaults

    @HoussemNasri
    HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    5c21e62 View commit details
    Browse the repository at this point in the history

  10. Persist 'useCustomCertificate' boolean preference

    @HoussemNasri
    HoussemNasri committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    bcc65c0 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Use certificate thumbprint as an alias 

    For the alias to be useful it has to be unique, I thought about using the serial number, but it is only unique for the CA, so I created a hash of all fields in the certificate
    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    ae8ddd8 View commit details
    Browse the repository at this point in the history

  2. Delete dummy certificates and use real imported certificate information

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    3b4abc1 View commit details
    Browse the repository at this point in the history

  3. Move certificate version formatting logic to the view

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    b5a8884 View commit details
    Browse the repository at this point in the history

  4. Move TrustStoreManager from GUI to Logic

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    fbb3bcc View commit details
    Browse the repository at this point in the history

  5. Use Integer to store version instead of primitive int

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    9a37493 View commit details
    Browse the repository at this point in the history

  6. Persist thumbprint, version, validFrom and validTo columns

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    9830eba View commit details
    Browse the repository at this point in the history

  7. Use localized strings

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    a38cc5c View commit details
    Browse the repository at this point in the history

  8. Fix failing test

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    f84ee96 View commit details
    Browse the repository at this point in the history

  9. Persist all certificate columns

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    ca5a90f View commit details
    Browse the repository at this point in the history

  10. Load truststore path from preferences

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    95e2b7f View commit details
    Browse the repository at this point in the history

  11. Deprecate bypassSSLVerification() and delete its usage 

    - I didn't delete it because users might want to enable ssl bypassing from SSL configuration
    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    ab987de View commit details
    Browse the repository at this point in the history

  12. Set truststore path at startup

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    f32baac View commit details
    Browse the repository at this point in the history

  13. Store truststore path in preference

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    051fcd6 View commit details
    Browse the repository at this point in the history

  14. Update CHANGELOG.md

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    49c512a View commit details
    Browse the repository at this point in the history

  15. Add an icon to 'Add certificate' button

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    daa05e2 View commit details
    Browse the repository at this point in the history

  16. Update truststore file on save preference

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    768493a View commit details
    Browse the repository at this point in the history

  17. Clear all custom certificates from the truststore at preference reset

    @HoussemNasri
    HoussemNasri committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    fc9de9f View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Use truststore as the single source of truth

    @HoussemNasri
    HoussemNasri committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    0162133 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into allow-custom-ssl

    @HoussemNasri
    HoussemNasri committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    d3a7a58 View commit details
    Browse the repository at this point in the history

  3. Show warning dialog on attempting to add a duplicate certificate 

    - Minor refactoring
- Added certificate deletion to UI
- i18n
    @HoussemNasri
    HoussemNasri committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    4060f44 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/allow-custom-ssl' into allow-cus… 

    …tom-ssl

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties
    @HoussemNasri
    HoussemNasri committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    d8b8958 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into allow-custom-ssl

    @HoussemNasri
    HoussemNasri committed Mar 22, 2022
    Configuration menu
    Copy the full SHA
    e41d126 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2022

  1. Stop allowing for toggling custom certificates usage

    @HoussemNasri
    HoussemNasri committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    1b6f3ef View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/allow-custom-ssl' into allow-cus… 

    …tom-ssl
    @HoussemNasri
    HoussemNasri committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    c747317 View commit details
    Browse the repository at this point in the history

  3. Delete SSL certificates

    @HoussemNasri
    HoussemNasri committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    b04887b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into allow-custom-ssl

    @HoussemNasri
    HoussemNasri committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    95e3b86 View commit details
    Browse the repository at this point in the history

  5. Fix failing test

    @HoussemNasri
    HoussemNasri committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    10015d2 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/allow-custom-ssl' into allow-cus… 

    …tom-ssl
    @HoussemNasri
    HoussemNasri committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    5f06abb View commit details
    Browse the repository at this point in the history