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
Make it more difficult to accidentally log sensitive headers #6551
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,25 +17,6 @@ | |
|
||
package okhttp3.internal | ||
|
||
import okhttp3.EventListener | ||
import okhttp3.Headers | ||
import okhttp3.Headers.Companion.headersOf | ||
import okhttp3.HttpUrl | ||
import okhttp3.OkHttp | ||
import okhttp3.OkHttpClient | ||
import okhttp3.RequestBody.Companion.toRequestBody | ||
import okhttp3.Response | ||
import okhttp3.ResponseBody.Companion.toResponseBody | ||
import okhttp3.internal.http2.Header | ||
import okio.Buffer | ||
import okio.BufferedSink | ||
import okio.BufferedSource | ||
import okio.ByteString.Companion.decodeHex | ||
import okio.ExperimentalFileSystem | ||
import okio.FileSystem | ||
import okio.Options | ||
import okio.Path | ||
import okio.Source | ||
import java.io.Closeable | ||
import java.io.FileNotFoundException | ||
import java.io.IOException | ||
|
@@ -57,6 +38,25 @@ import java.util.concurrent.ThreadFactory | |
import java.util.concurrent.TimeUnit | ||
import kotlin.text.Charsets.UTF_32BE | ||
import kotlin.text.Charsets.UTF_32LE | ||
import okhttp3.EventListener | ||
import okhttp3.Headers | ||
import okhttp3.Headers.Companion.headersOf | ||
import okhttp3.HttpUrl | ||
import okhttp3.OkHttp | ||
import okhttp3.OkHttpClient | ||
import okhttp3.RequestBody.Companion.toRequestBody | ||
import okhttp3.Response | ||
import okhttp3.ResponseBody.Companion.toResponseBody | ||
import okhttp3.internal.http2.Header | ||
import okio.Buffer | ||
import okio.BufferedSink | ||
import okio.BufferedSource | ||
import okio.ByteString.Companion.decodeHex | ||
import okio.ExperimentalFileSystem | ||
import okio.FileSystem | ||
import okio.Options | ||
import okio.Path | ||
import okio.Source | ||
|
||
@JvmField | ||
val EMPTY_BYTE_ARRAY = ByteArray(0) | ||
|
@@ -249,6 +249,14 @@ fun String.canParseAsIpAddress(): Boolean { | |
return VERIFY_AS_IP_ADDRESS.matches(this) | ||
} | ||
|
||
/** Returns true if we should void putting this this header in an exception or toString(). */ | ||
fun isSensitiveHeader(name: String): Boolean { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this be a public API feature? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don’t think so. It’s the sort of thing you don’t know you need until it’s too late. |
||
return name.equals("Authorization", ignoreCase = true) || | ||
name.equals("Cookie", ignoreCase = true) || | ||
name.equals("Proxy-Authorization", ignoreCase = true) || | ||
name.equals("Set-Cookie", ignoreCase = true) | ||
} | ||
|
||
/** Returns a [Locale.US] formatted [String]. */ | ||
fun format(format: String, vararg args: Any): String { | ||
return String.format(Locale.US, format, *args) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.