Skip to content

Update supported file formats #16424

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

Merged
mosabua merged 1 commit into from
Apr 28, 2023
Merged

Update supported file formats #16424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions docs/src/main/sphinx/security/ldap.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ Property Description
Password authenticator configuration
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Password authentication needs to be configured to use LDAP. Create an
Password authentication must be configured to use LDAP. Create an
``etc/password-authenticator.properties`` file on the coordinator. Example:

.. code-block:: text

password-authenticator.name=ldap
ldap.url=ldaps://ldap-server:636
ldap.ssl.truststore.path=/path/to/ldap_server.crt
ldap.ssl.truststore.path=/path/to/ldap_server.pem
ldap.user-bind-pattern=<Refer below for usage>

================================== ======================================================
Expand All @@ -93,10 +93,12 @@ Property Description
``ldap.allow-insecure=true``.
``ldap.allow-insecure`` Allow using an LDAP connection that is not secured with
TLS.
``ldap.ssl.keystore.path`` Path to the PEM or JKS key store.
``ldap.ssl.keystore.path`` The path to the :doc:`PEM </security/inspect-pem>`
or :doc:`JKS </security/inspect-jks>` keystore file.
``ldap.ssl.keystore.password`` Password for the key store.
``ldap.ssl.truststore.path`` Path to the PEM or JKS trust store.
``ldap.ssl.truststore.password`` Password for the trust store.
``ldap.ssl.truststore.path`` The path to the :doc:`PEM </security/inspect-pem>`
or :doc:`JKS </security/inspect-jks>` keystore file.
``ldap.ssl.truststore.password`` Password for the truststore.
``ldap.user-bind-pattern`` This property can be used to specify the LDAP user
bind string for password authentication. This property
must contain the pattern ``${USER}``, which is
Expand Down
2 changes: 2 additions & 0 deletions docs/src/main/sphinx/security/tls.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ Keys and certificates

Trino can read certificates and private keys encoded in PEM encoded PKCS #1, PEM
encoded PKCS #8, PKCS #12, and the legacy Java KeyStore (JKS) format.
Certificates and private keys encoded in a binary format such as DER must be
converted.

Make sure you obtain a certificate that is validated by a recognized
:ref:`certificate authority <glossCA>`.
Expand Down