Skip to content

🐛 Fix empty cookie header parsing and header value set #1733

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
merged 3 commits into from
Mar 12, 2023
Merged

🐛 Fix empty cookie header parsing and header value set #1733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8b09e9
🐛 Fix empty cookie header parsing and header value set
AlexV525 Mar 12, 2023
5b371a9
✅ Add tests
AlexV525 Mar 12, 2023
8061d8a
📝 CHANGELOG
AlexV525 Mar 12, 2023
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
3 changes: 2 additions & 1 deletion plugins/cookie_manager/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- Fix empty cookie parsing and header value set.
- Improve code formats according to linter rules.

## 2.1.1
Expand All @@ -27,4 +28,4 @@

## 0.0.1 - 2019.9.17

* A cookie manager for Dio.
* A cookie manager for Dio.
Copy link
Contributor

@ueman ueman Mar 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

9 changes: 7 additions & 2 deletions plugins/cookie_manager/lib/src/cookie_mgr.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,17 @@ class CookieManager extends Interceptor {
@override
void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
cookieJar.loadForRequest(options.uri).then((cookies) {
options.headers[HttpHeaders.cookieHeader] = getCookies([
final previousCookies =
options.headers[HttpHeaders.cookieHeader] as String?;
final newCookies = getCookies([
...cookies,
...?options.headers[HttpHeaders.cookieHeader]
...?previousCookies
?.split(';')
.where((e) => e.isNotEmpty)
.map((c) => Cookie.fromSetCookieValue(c)),
]);
options.headers[HttpHeaders.cookieHeader] =
newCookies.isNotEmpty ? newCookies : null;
handler.next(options);
}).catchError((dynamic e, StackTrace s) {
final err = DioError(requestOptions: options, error: e, stackTrace: s);
Expand Down
26 changes: 26 additions & 0 deletions plugins/cookie_manager/test/cookies_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,30 @@ void main() {

cookieManager.onRequest(options, mockRequestInterceptorHandler);
});

group('Empty cookies', () {
test('not produced by default', () async {
final dio = Dio();
dio.interceptors.add(CookieManager(CookieJar()));
final response = await dio.get('http://www.gstatic.com/generate_204');
expect(response.requestOptions.headers[HttpHeaders.cookieHeader], null);
});

test('can be parsed', () async {
final dio = Dio();
dio.interceptors
..add(
InterceptorsWrapper(
onRequest: (options, handler) {
// Write an empty cookie header.
options.headers[HttpHeaders.cookieHeader] = '';
handler.next(options);
},
),
)
..add(CookieManager(CookieJar()));
final response = await dio.get('http://www.gstatic.com/generate_204');
expect(response.requestOptions.headers[HttpHeaders.cookieHeader], null);
});
});
}