Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Side by Side Diff: net/websockets/websocket_extension_parser.h

Issue 1047623002: Support parsing a Sec-WebSocket-Extensions header with multiple elements (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clear extensions_ if errored Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_WEBSOCKETS_WEBSOCKET_EXTENSION_PARSER_H_ 5 #ifndef NET_WEBSOCKETS_WEBSOCKET_EXTENSION_PARSER_H_
6 #define NET_WEBSOCKETS_WEBSOCKET_EXTENSION_PARSER_H_ 6 #define NET_WEBSOCKETS_WEBSOCKET_EXTENSION_PARSER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector>
9 10
10 #include "base/strings/string_piece.h" 11 #include "base/strings/string_piece.h"
11 #include "net/base/net_export.h" 12 #include "net/base/net_export.h"
12 #include "net/websockets/websocket_extension.h" 13 #include "net/websockets/websocket_extension.h"
13 14
14 namespace net { 15 namespace net {
15 16
16 class NET_EXPORT_PRIVATE WebSocketExtensionParser { 17 class NET_EXPORT_PRIVATE WebSocketExtensionParser {
17 public: 18 public:
18 WebSocketExtensionParser(); 19 WebSocketExtensionParser();
19 ~WebSocketExtensionParser(); 20 ~WebSocketExtensionParser();
20 21
21 // Parses the given string as a WebSocket extension header value. 22 // Parses the given string as a Sec-WebSocket-Extensions header value.
22 // This parser assumes some preprocesses are made. 23 //
23 // - The parser parses single extension at a time. This means that 24 // There must be no newline characters in the input. LWS-concatenation must
24 // the parser parses |extension| in RFC6455 9.1, not |extension-list|. 25 // have already been done before calling this method.
25 // - There is no newline characters in the input. LWS-concatenation must
26 // have already been done.
27 void Parse(const char* data, size_t size); 26 void Parse(const char* data, size_t size);
28 void Parse(const std::string& data) { 27 void Parse(const std::string& data) {
29 Parse(data.data(), data.size()); 28 Parse(data.data(), data.size());
30 } 29 }
31 30
31 // Returns true if the last Parse() method call encountered any syntax error.
32 bool has_error() const { return has_error_; } 32 bool has_error() const { return has_error_; }
33 const WebSocketExtension& extension() const { return extension_; } 33 // Returns the result of the last Parse() method call.
34 const std::vector<WebSocketExtension>& extensions() const {
35 return extensions_;
36 }
34 37
35 private: 38 private:
36 void Consume(char c); 39 void Consume(char c);
37 void ConsumeExtension(WebSocketExtension* extension); 40 void ConsumeExtension(WebSocketExtension* extension);
38 void ConsumeExtensionParameter(WebSocketExtension::Parameter* parameter); 41 void ConsumeExtensionParameter(WebSocketExtension::Parameter* parameter);
39 void ConsumeToken(base::StringPiece* token); 42 void ConsumeToken(base::StringPiece* token);
40 void ConsumeQuotedToken(std::string* token); 43 void ConsumeQuotedToken(std::string* token);
41 void ConsumeSpaces(); 44 void ConsumeSpaces();
42 bool Lookahead(char c); 45 bool Lookahead(char c);
43 bool ConsumeIfMatch(char c); 46 bool ConsumeIfMatch(char c);
44 size_t UnconsumedBytes() const { return end_ - current_; } 47 size_t UnconsumedBytes() const { return end_ - current_; }
45 48
46 static bool IsControl(char c); 49 static bool IsControl(char c);
47 static bool IsSeparator(char c); 50 static bool IsSeparator(char c);
48 51
52 // The current position in the input string.
49 const char* current_; 53 const char* current_;
54 // The pointer of the end of the input string.
50 const char* end_; 55 const char* end_;
51 bool has_error_; 56 bool has_error_;
52 WebSocketExtension extension_; 57 std::vector<WebSocketExtension> extensions_;
53 58
54 DISALLOW_COPY_AND_ASSIGN(WebSocketExtensionParser); 59 DISALLOW_COPY_AND_ASSIGN(WebSocketExtensionParser);
55 }; 60 };
56 61
57 } // namespace net 62 } // namespace net
58 63
59 #endif // NET_WEBSOCKETS_WEBSOCKET_EXTENSION_PARSER_H_ 64 #endif // NET_WEBSOCKETS_WEBSOCKET_EXTENSION_PARSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698