Skip to content

Commit

Permalink
Merge changes from the latest release into main branch (google#1433)
Browse files Browse the repository at this point in the history
* add workaround for pinfo warning output (google#1418)

* Update version to 20231116.1

* Fix plaso dependencies (google#1420)

* fix deps

* fix test

* Update version to 20231116.2

* Fix plaso dependencies (google#1420)

* fix deps

* fix test

* update docs link

---------

Co-authored-by: hacktobeer <ramsesdebeer@gmail.com>
Co-authored-by: Aaron Peterson <aaronp@gmail.com>
  • Loading branch information
3 people authored Feb 14, 2024
1 parent 7390bc6 commit ddf5bd3
Show file tree
Hide file tree
Showing 4 changed files with 1,281 additions and 2,515 deletions.
2 changes: 1 addition & 1 deletion docs/user/api-server.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ We also provide a [command-line tool](https://github.com/google/turbinia/tree/ma
### Authentication
Turbinia API Server uses OAuth2-proxy to provide OpenID Connect and OAuth2 authentication support. If you deployed Turbinia using GCP and GKE cluster instructions, follow the guide for [external access and authentication](https://github.com/google/osdfir-infrastructure/tree/main/charts/turbinia) to complete the authentication configuration.

For Turbinia deployments using the [Docker Installation method](install.md), or a non-Google identity provider, make sure to edit the ```oauth2_proxy.cfg``` configuration file in ```docker/oauth2_proxy``` with the appropriate identity provider information such as ```client_id``` and ```client_secret``` prior to deploying the Docker containers in the local stack. If your deployment will use an identity provider other than Google, you will also need to change the ```provider``` and related settings. For more information and how to configure OAuth2-proxy for different providers, refer to the [OAuth2-Proxy Documentation](https://oauth2-proxy.github.io/oauth2-proxy/configuration/oauth_provider).
For Turbinia deployments using the [Docker Installation method](install.md), or a non-Google identity provider, make sure to edit the ```oauth2_proxy.cfg``` configuration file in ```docker/oauth2_proxy``` with the appropriate identity provider information such as ```client_id``` and ```client_secret``` prior to deploying the Docker containers in the local stack. If your deployment will use an identity provider other than Google, you will also need to change the ```provider``` and related settings. For more information and how to configure OAuth2-proxy for different providers, refer to the [OAuth2-Proxy Documentation](https://oauth2-proxy.github.io/oauth2-proxy/configuration/providers/google).
Loading

0 comments on commit ddf5bd3

Please sign in to comment.