diff --git a/docs/docs/configuration/alpha_config.md b/docs/docs/configuration/alpha_config.md index d2442a69..ea2466d6 100644 --- a/docs/docs/configuration/alpha_config.md +++ b/docs/docs/configuration/alpha_config.md @@ -212,7 +212,7 @@ response header. | Field | Type | Description | | ----- | ---- | ----------- | | `name` | _string_ | Name is the header name to be used for this set of values.
Names should be unique within a list of Headers. | -| `preserveRequestValue` | _bool_ | PreserveRequestValue determines whether any values for this header
should be preserved for the request to the upstream server.
This option only takes effet on injected request headers.
Defaults to false (headers that match this header will be stripped). | +| `preserveRequestValue` | _bool_ | PreserveRequestValue determines whether any values for this header
should be preserved for the request to the upstream server.
This option only applies to injected request headers.
Defaults to false (headers that match this header will be stripped). | | `values` | _[[]HeaderValue](#headervalue)_ | Values contains the desired values for this header | ### HeaderValue @@ -335,8 +335,8 @@ Server represents the configuration for an HTTP(S) server | Field | Type | Description | | ----- | ---- | ----------- | -| `BindAddress` | _string_ | BindAddress is the the address on which to serve traffic.
Leave blank or set to "-" to disable. | -| `SecureBindAddress` | _string_ | SecureBindAddress is the the address on which to serve secure traffic.
Leave blank or set to "-" to disable. | +| `BindAddress` | _string_ | BindAddress is the address on which to serve traffic.
Leave blank or set to "-" to disable. | +| `SecureBindAddress` | _string_ | SecureBindAddress is the address on which to serve secure traffic.
Leave blank or set to "-" to disable. | | `TLS` | _[TLS](#tls)_ | TLS contains the information for loading the certificate and key for the
secure traffic. | ### TLS @@ -347,7 +347,7 @@ TLS contains the information for loading a TLS certifcate and key. | Field | Type | Description | | ----- | ---- | ----------- | -| `Key` | _[SecretSource](#secretsource)_ | Key is the the TLS key data to use.
Typically this will come from a file. | +| `Key` | _[SecretSource](#secretsource)_ | Key is the TLS key data to use.
Typically this will come from a file. | | `Cert` | _[SecretSource](#secretsource)_ | Cert is the TLS certificate data to use.
Typically this will come from a file. | ### Upstream diff --git a/docs/docs/configuration/sessions.md b/docs/docs/configuration/sessions.md index e8c4204f..174164ba 100644 --- a/docs/docs/configuration/sessions.md +++ b/docs/docs/configuration/sessions.md @@ -33,7 +33,7 @@ users to re-authenticate ### Redis Storage The Redis Storage backend stores sessions, encrypted, in redis. Instead sending all the information -back the the client for storage, as in the [Cookie storage](#cookie-storage), a ticket is sent back +back the client for storage, as in the [Cookie storage](#cookie-storage), a ticket is sent back to the user as the cookie value instead. A ticket is composed as the following: diff --git a/docs/versioned_docs/version-6.1.x/configuration/sessions.md b/docs/versioned_docs/version-6.1.x/configuration/sessions.md index e8c4204f..174164ba 100644 --- a/docs/versioned_docs/version-6.1.x/configuration/sessions.md +++ b/docs/versioned_docs/version-6.1.x/configuration/sessions.md @@ -33,7 +33,7 @@ users to re-authenticate ### Redis Storage The Redis Storage backend stores sessions, encrypted, in redis. Instead sending all the information -back the the client for storage, as in the [Cookie storage](#cookie-storage), a ticket is sent back +back the client for storage, as in the [Cookie storage](#cookie-storage), a ticket is sent back to the user as the cookie value instead. A ticket is composed as the following: diff --git a/docs/versioned_docs/version-7.0.x/configuration/alpha_config.md b/docs/versioned_docs/version-7.0.x/configuration/alpha_config.md index a17d3515..f9bb5d86 100644 --- a/docs/versioned_docs/version-7.0.x/configuration/alpha_config.md +++ b/docs/versioned_docs/version-7.0.x/configuration/alpha_config.md @@ -151,7 +151,7 @@ response header. | Field | Type | Description | | ----- | ---- | ----------- | | `name` | _string_ | Name is the header name to be used for this set of values.
Names should be unique within a list of Headers. | -| `preserveRequestValue` | _bool_ | PreserveRequestValue determines whether any values for this header
should be preserved for the request to the upstream server.
This option only takes effet on injected request headers.
Defaults to false (headers that match this header will be stripped). | +| `preserveRequestValue` | _bool_ | PreserveRequestValue determines whether any values for this header
should be preserved for the request to the upstream server.
This option only applies to injected request headers.
Defaults to false (headers that match this header will be stripped). | | `values` | _[[]HeaderValue](#headervalue)_ | Values contains the desired values for this header | ### HeaderValue diff --git a/docs/versioned_docs/version-7.0.x/configuration/sessions.md b/docs/versioned_docs/version-7.0.x/configuration/sessions.md index e8c4204f..174164ba 100644 --- a/docs/versioned_docs/version-7.0.x/configuration/sessions.md +++ b/docs/versioned_docs/version-7.0.x/configuration/sessions.md @@ -33,7 +33,7 @@ users to re-authenticate ### Redis Storage The Redis Storage backend stores sessions, encrypted, in redis. Instead sending all the information -back the the client for storage, as in the [Cookie storage](#cookie-storage), a ticket is sent back +back the client for storage, as in the [Cookie storage](#cookie-storage), a ticket is sent back to the user as the cookie value instead. A ticket is composed as the following: diff --git a/docs/versioned_docs/version-7.1.x/configuration/alpha_config.md b/docs/versioned_docs/version-7.1.x/configuration/alpha_config.md index 1fe3f1f7..e088929a 100644 --- a/docs/versioned_docs/version-7.1.x/configuration/alpha_config.md +++ b/docs/versioned_docs/version-7.1.x/configuration/alpha_config.md @@ -153,7 +153,7 @@ response header. | Field | Type | Description | | ----- | ---- | ----------- | | `name` | _string_ | Name is the header name to be used for this set of values.
Names should be unique within a list of Headers. | -| `preserveRequestValue` | _bool_ | PreserveRequestValue determines whether any values for this header
should be preserved for the request to the upstream server.
This option only takes effet on injected request headers.
Defaults to false (headers that match this header will be stripped). | +| `preserveRequestValue` | _bool_ | PreserveRequestValue determines whether any values for this header
should be preserved for the request to the upstream server.
This option only applies to injected request headers.
Defaults to false (headers that match this header will be stripped). | | `values` | _[[]HeaderValue](#headervalue)_ | Values contains the desired values for this header | ### HeaderValue @@ -193,8 +193,8 @@ Server represents the configuration for an HTTP(S) server | Field | Type | Description | | ----- | ---- | ----------- | -| `BindAddress` | _string_ | BindAddress is the the address on which to serve traffic.
Leave blank or set to "-" to disable. | -| `SecureBindAddress` | _string_ | SecureBindAddress is the the address on which to serve secure traffic.
Leave blank or set to "-" to disable. | +| `BindAddress` | _string_ | BindAddress is the address on which to serve traffic.
Leave blank or set to "-" to disable. | +| `SecureBindAddress` | _string_ | SecureBindAddress is the address on which to serve secure traffic.
Leave blank or set to "-" to disable. | | `TLS` | _[TLS](#tls)_ | TLS contains the information for loading the certificate and key for the
secure traffic. | ### TLS @@ -205,7 +205,7 @@ TLS contains the information for loading a TLS certifcate and key. | Field | Type | Description | | ----- | ---- | ----------- | -| `Key` | _[SecretSource](#secretsource)_ | Key is the the TLS key data to use.
Typically this will come from a file. | +| `Key` | _[SecretSource](#secretsource)_ | Key is the TLS key data to use.
Typically this will come from a file. | | `Cert` | _[SecretSource](#secretsource)_ | Cert is the TLS certificate data to use.
Typically this will come from a file. | ### Upstream diff --git a/docs/versioned_docs/version-7.1.x/configuration/sessions.md b/docs/versioned_docs/version-7.1.x/configuration/sessions.md index e8c4204f..174164ba 100644 --- a/docs/versioned_docs/version-7.1.x/configuration/sessions.md +++ b/docs/versioned_docs/version-7.1.x/configuration/sessions.md @@ -33,7 +33,7 @@ users to re-authenticate ### Redis Storage The Redis Storage backend stores sessions, encrypted, in redis. Instead sending all the information -back the the client for storage, as in the [Cookie storage](#cookie-storage), a ticket is sent back +back the client for storage, as in the [Cookie storage](#cookie-storage), a ticket is sent back to the user as the cookie value instead. A ticket is composed as the following: diff --git a/pkg/apis/options/header.go b/pkg/apis/options/header.go index 4b41eff9..8795665c 100644 --- a/pkg/apis/options/header.go +++ b/pkg/apis/options/header.go @@ -9,7 +9,7 @@ type Header struct { // PreserveRequestValue determines whether any values for this header // should be preserved for the request to the upstream server. - // This option only takes effet on injected request headers. + // This option only applies to injected request headers. // Defaults to false (headers that match this header will be stripped). PreserveRequestValue bool `json:"preserveRequestValue,omitempty"` diff --git a/pkg/apis/options/server.go b/pkg/apis/options/server.go index a100d9c5..5148366e 100644 --- a/pkg/apis/options/server.go +++ b/pkg/apis/options/server.go @@ -2,11 +2,11 @@ package options // Server represents the configuration for an HTTP(S) server type Server struct { - // BindAddress is the the address on which to serve traffic. + // BindAddress is the address on which to serve traffic. // Leave blank or set to "-" to disable. BindAddress string - // SecureBindAddress is the the address on which to serve secure traffic. + // SecureBindAddress is the address on which to serve secure traffic. // Leave blank or set to "-" to disable. SecureBindAddress string @@ -17,7 +17,7 @@ type Server struct { // TLS contains the information for loading a TLS certifcate and key. type TLS struct { - // Key is the the TLS key data to use. + // Key is the TLS key data to use. // Typically this will come from a file. Key *SecretSource diff --git a/pkg/app/pagewriter/error_page.go b/pkg/app/pagewriter/error_page.go index 831eeb3a..1a7a8312 100644 --- a/pkg/app/pagewriter/error_page.go +++ b/pkg/app/pagewriter/error_page.go @@ -9,7 +9,7 @@ import ( "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" ) -// errorMessages are default error messages for each of the the different +// errorMessages are default error messages for each of the different // http status codes expected to be rendered in the error page. var errorMessages = map[int]string{ http.StatusInternalServerError: "Oops! Something went wrong. For more information contact your server administrator.", diff --git a/pkg/requests/result.go b/pkg/requests/result.go index 2574aad5..305fefe2 100644 --- a/pkg/requests/result.go +++ b/pkg/requests/result.go @@ -50,7 +50,7 @@ func (r *result) Body() []byte { return r.body } -// UnmarshalInto attempts to unmarshal the response into the the given interface. +// UnmarshalInto attempts to unmarshal the response into the given interface. // The response body is assumed to be JSON. // The response must have a 200 status otherwise an error will be returned. func (r *result) UnmarshalInto(into interface{}) error {