summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Collapse)AuthorAgeFilesLines
* Display more information at chrome://net-internals/#spdyrch@chromium.org2011-02-092-2/+31
| | | | | | | | | | | | In particular, list the mapping from host:port to port:alternate-protocol and the global spdy configuration state. BUG=none TEST=chrome://net-internals/#spdy Review URL: http://codereview.chromium.org/6465001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74355 0039d316-1c4b-4281-b951-d872f2087c98
* Add chrome.google.com to the STS list.cevans@chromium.org2011-02-091-0/+1
| | | | | | | | | | | It's very sensitive and already resolutely https-only, but putting it on the list will defend against additional slip-ups such as some mixed-content errors. BUG=None TEST=None Review URL: http://codereview.chromium.org/6410113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74310 0039d316-1c4b-4281-b951-d872f2087c98
* Migrate Proxy Settings API to net::ProxyServerbattre@chromium.org2011-02-092-9/+21
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/6450006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74293 0039d316-1c4b-4281-b951-d872f2087c98
* Do not pass CRYPT_NOHASHOID to CryptSignHash with CALG_SSL3_SHAMD5.rsleevi@chromium.org2011-02-091-2/+2
| | | | | | | | | | | | This may fix bug 72041. R=wtc BUG=72041 TEST=covered by existing net_unittests Review URL: http://codereview.chromium.org/6458023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74254 0039d316-1c4b-4281-b951-d872f2087c98
* Enable OCSP Stapling in TLS requests on Windows Vista+rsleevi@chromium.org2011-02-091-20/+45
| | | | | | | | | | R=agl,wtc BUG=none TEST=none Review URL: http://codereview.chromium.org/6158003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74243 0039d316-1c4b-4281-b951-d872f2087c98
* Change backslashes in download file path to underscores.ahendrickson@chromium.org2011-02-082-6/+10
| | | | | | | | | BUG=70702 TEST=Upload a file with apostrophes to mediafire.com, then download it. Review URL: http://codereview.chromium.org/6286125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74193 0039d316-1c4b-4281-b951-d872f2087c98
* NetLog: Log net error codes on a lot of EndEvents.mmenke@chromium.org2011-02-0816-89/+78
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/6349083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74143 0039d316-1c4b-4281-b951-d872f2087c98
* Add logging for ERR_UNEXPECTED_SECURITY_LIBRARY_STATUS on ↵cbentzel@chromium.org2011-02-081-1/+4
| | | | | | | | | | | | | AcquireCredentialsHandle. This was being done for InitSecurityContext, but duplicated here. BUG=72126 TEST=None Review URL: http://codereview.chromium.org/6449004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74142 0039d316-1c4b-4281-b951-d872f2087c98
* Remove some ToWStringHack()s that are in Windows-only code.evan@chromium.org2011-02-082-4/+4
| | | | | | | | BUG=69467 Review URL: http://codereview.chromium.org/6286156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74122 0039d316-1c4b-4281-b951-d872f2087c98
* Add ability to create self signed certs to mac.dmaclach@chromium.org2011-02-083-4/+330
| | | | | | | | | BUG=67929 TEST=BUILD Review URL: http://codereview.chromium.org/6312157 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74115 0039d316-1c4b-4281-b951-d872f2087c98
* Add ahendrickson@chromium.org to the OWNERS file.wtc@chromium.org2011-02-071-0/+1
| | | | | | | | | R=eroman,willchan BUG=none TEST=none Review URL: http://codereview.chromium.org/6286155 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74042 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a clang warning.thakis@chromium.org2011-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | net/tools/flip_server/balsa_frame.cc:1285:23: error: equality comparison with extraneous parentheses [-Wparentheses] if ((parse_state_ == BalsaFrameEnums::READING_HEADER_AND_FIRSTLINE)) { ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ net/tools/flip_server/balsa_frame.cc:1285:23: note: use '=' to turn this equality comparison into an assignment if ((parse_state_ == BalsaFrameEnums::READING_HEADER_AND_FIRSTLINE)) { ^~ = net/tools/flip_server/balsa_frame.cc:1285:23: note: remove extraneous parentheses around the comparison to silence this warning if ((parse_state_ == BalsaFrameEnums::READING_HEADER_AND_FIRSTLINE)) { ~ ^ ~ 1 error generated. BUG=none TEST=none TBR=mbelshe git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74011 0039d316-1c4b-4281-b951-d872f2087c98
* Test that the same socket is used for each round of connection-based auth.cbentzel@chromium.org2011-02-061-5/+69
| | | | | | | | | | | NTLM and Negotiate were broken in beta builds around M6/M7 since the socket was released back to the general socket pool. A competing request would then grab it, but the server would expect another round of authentication on the same socket and authentication would break. BUG=58770 TEST=net_unittests --gtest_filter="*MultiRoundAuth" Review URL: http://codereview.chromium.org/6349108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73953 0039d316-1c4b-4281-b951-d872f2087c98
* When performing SSL client auth on Windows, no longer make a comparison ↵rsleevi@chromium.org2011-02-061-4/+2
| | | | | | | | | | | | | between the public key of the selected certificate and the private key of the obtained key. If the keys mismatch, it will be the SSL peer's responsibility for detecting this. The intent was to catch such a client-detectable error before transmitting anything to the server, but it may be causing a regression in authentication performance for some smart cards. BUG=71928 TEST=none Review URL: http://codereview.chromium.org/6250185 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73937 0039d316-1c4b-4281-b951-d872f2087c98
* Do not enforce pyproto dir for running testserver.nirnimesh@chromium.org2011-02-051-2/+3
| | | | | | | | | | | | | | | | | | | Apparently, the test_server enforces that it can find the generated pyproto dir before it fires off testserver.py. This is wrong: - generated pyproto files are not archived, so cannot be used other than on the builders that build it - you can get away by just creating an empty pyproto dir, which gives a false sense of success. Changed fatal error to warning, and moving on. BUG=71976 TEST= Review URL: http://codereview.chromium.org/6368106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73935 0039d316-1c4b-4281-b951-d872f2087c98
* When performing SSL client certificate authentication on Windows, and an ↵rsleevi@chromium.org2011-02-052-3/+39
| | | | | | | | | | | | | operation using the certificate's private key fails, remove the cached provider handle from the client certificate. If a user is using a smart-card based certificate, and removes the card from their reader, SSLClientSocketNSS will rightly fail the handshake because it's unable to generate the CertificateVerify message as part of the client certificate handshake. However, because the HCRYPTPROV used to obtain the private key is optimistically cached in the X509Certificate, all future attempts to use the private key, even after the card has been re-inserted, end up failing because the cached handle was invalidated once the card was removed. By removing the cached provider handle from the certificate, the user should be able to re-authenticate with the card/reader and, as a result, re-authenticate with the peer. BUG=none TEST=none Review URL: http://codereview.chromium.org/6250042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73914 0039d316-1c4b-4281-b951-d872f2087c98
* When performing SSL client authentication on Windows via NSS, change the ↵rsleevi@chromium.org2011-02-054-77/+42
| | | | | | | | | | | | | | returned key type to use a PCERT_KEY_CONTEXT allocated via NSS's PORT_Alloc(), rather than an HCRYPTPROV, for native client certificate authentication. There are two reasons for doing this; first, a PCERT_KEY_CONTEXT lets us transmit a dwKeySpec, indicating whether to use the AT_KEYEXCHANGE or AT_SIGNATURE key for CryptoAPI keys. Second, a small piece of syntactic fluff, a PCERT_KEY_CONTEXT easily supports CNG keys for Vista+, which though not presently supported, is a TODO. R=wtc BUG=37560, 71748 TEST=Perform SSL client auth on Windows. Review URL: http://codereview.chromium.org/4670004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73913 0039d316-1c4b-4281-b951-d872f2087c98
* Return more specific error messages when performing a SSL client auth ↵rsleevi@chromium.org2011-02-055-23/+58
| | | | | | | | | | | handshake and an error signing with the certificate private key is encountered, rather than using ERR_FAILED/ERR_SSL_PROTOCOL_ERROR. BUG=69609 TEST=none Review URL: http://codereview.chromium.org/6371014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73891 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the expectation in OverrideUserAgent net test to ensure that it passes withananta@chromium.org2011-02-041-3/+3
| | | | | | | | | | | chrome frame net tests. This is to account for the changed UA string in chrome frame. BUG=none TEST=Covered by existing chrome frame net test Review URL: http://codereview.chromium.org/6246121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73867 0039d316-1c4b-4281-b951-d872f2087c98
* Disk cache: Reset the number of fatal errors each timervargas@google.com2011-02-041-0/+5
| | | | | | | | | | | | we report it and make sure that we don't report it more than once a week. BUG=none TEST=none Review URL: http://codereview.chromium.org/6410044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73829 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup the net/tools/ directory so there are no warnings from our clang plugin.erg@google.com2011-02-0429-490/+754
| | | | | | | | | | | | | (I've separated this chunk out since mbelshe said he was working here and I don't want to accidentally clobber his work. This is the last patch before Nico can turn the inlining plugin on for all targets.) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6368037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73820 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: remove HttpListenSocket dependency on flush events.pfeldman@chromium.org2011-02-042-9/+31
| | | | | | | | Original review at: http://codereview.chromium.org/6349037/. TBR= git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73807 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 73690 - net: Add namespace net to network_change_notifier_netlink_linux.tfarina@chromium.org2011-02-032-10/+2
| | | | | | | | | | | | BUG=64263 TEST=compiled locally and trybots Review URL: http://codereview.chromium.org/6368066 TBR=tfarina@chromium.org Review URL: http://codereview.chromium.org/6286093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73701 0039d316-1c4b-4281-b951-d872f2087c98
* net: Add namespace net to network_change_notifier_netlink_linux.tfarina@chromium.org2011-02-032-2/+10
| | | | | | | | | BUG=64263 TEST=compiled locally and trybots Review URL: http://codereview.chromium.org/6368066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73690 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor HttpNetworkSession construction.willchan@chromium.org2011-02-0329-394/+358
| | | | | | | | | | | Introduce HttpNetworkSession::Params. This should make it easy to add new optionally NULL parameters. I also took this opportunity to eliminate some copy/pastes of TestURLRequestContext and make them use the original. I was also able to remove the need for ClientSocketFactory::GetDefaultFactory() calls and new SpdySessionPool() calls in most places. BUG=none TEST=none Review URL: http://codereview.chromium.org/6349028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73669 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: follo up to http server introduction. Report OnClose from ↵pfeldman@chromium.org2011-02-032-5/+8
| | | | | | | | | | | Connection destructor. BUG= TEST= Review URL: http://codereview.chromium.org/6312127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73640 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: split http_listen_socket into http_server and connection.pfeldman@chromium.org2011-02-035-187/+275
| | | | | | | | | BUG= TEST= Review URL: http://codereview.chromium.org/6410033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73631 0039d316-1c4b-4281-b951-d872f2087c98
* Alter the forward declarations so they match the definition. Unbreaks clang, ↵avi@chromium.org2011-02-022-2/+2
| | | | | | | | | | | broken by r73491. BUG=none TEST=none Review URL: http://codereview.chromium.org/6250117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73522 0039d316-1c4b-4281-b951-d872f2087c98
* Split flip_in_mem_edsm_server into a gazillion pieces.mbelshe@chromium.org2011-02-0225-3216/+3612
| | | | | | | | | | | For the most part, this is a straight refactor. I'm sure I broke something. BUG=monolithic code TEST=none Review URL: http://codereview.chromium.org/6392011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73491 0039d316-1c4b-4281-b951-d872f2087c98
* Fix device management testservergfeher@chromium.org2011-02-021-2/+3
| | | | | | | | | | | Fix serving of policies after the recent config file format change. BUG=none TEST=Run the testserver with Chrome and check that policies are applied to Chrome. Review URL: http://codereview.chromium.org/6246043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73448 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 73402 - Disk cache: Disable the throttling experiment.rvargas@google.com2011-02-021-1/+12
| | | | | | | | | | | | | | | This is intended for the beta/stable channels. BUG=none TEST=none TBR=gavinp Review URL: http://codereview.chromium.org/6286036 TBR=rvargas@google.com Review URL: http://codereview.chromium.org/6250097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73405 0039d316-1c4b-4281-b951-d872f2087c98
* Disk cache: Disable the throttling experiment.rvargas@google.com2011-02-021-12/+1
| | | | | | | | | | | | This is intended for the beta/stable channels. BUG=none TEST=none TBR=gavinp Review URL: http://codereview.chromium.org/6286036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73402 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the nits I pointed out in the review ofwtc@chromium.org2011-02-022-23/+34
| | | | | | | | | | | http://codereview.chromium.org/6002003/ R=hclam BUG=none TEST=net_unittests --gtest_filter=X509* Review URL: http://codereview.chromium.org/6049010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73384 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the CertDatabaseNSSTest SetUp creating multiple NSS DBs (regressed in ↵mattm@chromium.org2011-02-011-5/+15
| | | | | | | | | | | r69107). BUG=none TEST=none Review URL: http://codereview.chromium.org/6264016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73366 0039d316-1c4b-4281-b951-d872f2087c98
* Unreverting: First steps towards webRequest extension API.mpcomplete@chromium.org2011-02-013-0/+15
| | | | | | | | | | | | | | Only an asynchronous version of onBeforeRequest is implement, with limited data being passed. Original CL: http://src.chromium.org/viewvc/chrome?view=rev&revision=73196 BUG=60101 TEST=no Review URL: http://codereview.chromium.org/6246032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73344 0039d316-1c4b-4281-b951-d872f2087c98
* Silence testserver logs when tests are run in non-verbose modersimha@chromium.org2011-02-012-1/+13
| | | | | | | | | | | | | The console output from testserver.py, chromiumsync.py and xmppserver.py during sync integration test runs is pretty chatty, and could do with being disabled by default. In addition, testserver.py spits out logs for non-sync tests even when the tests are run in non-verbose mode. This patch adds a switch to testserver.py called "log-to-console", and ties it up to the logging level returned by logging::GetMinLogLevel(). This way, testserver logs are printed on the console (in addition to being written to testserver.log) when tests are run in verbose mode. However, when tests are run in non-verbose mode, testserver logs are only written to the log file, but not to the console. BUG=71241 TEST=sync_integration_tests Review URL: http://codereview.chromium.org/6404003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73330 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 73265 - Check that uncompressed data passed to zlib is defined, and ↵danno@chromium.org2011-02-011-8/+0
| | | | | | | | | | | | | | | | | | | | | mark compression result as defined. This way, we suppress benign reports from zlib (see http://www.zlib.net/zlib_faq.html#faq36), without losing coverage of spdy code. This patch was prepared by eugenis@chromium.org (doesn't have a committer access yet) and reviewed at http://codereview.chromium.org/6310016/ BUG=70098 TEST=run automated_ui_tests with random action lists under Valgrind for a few hours at least. TBR=wtc Review URL: http://codereview.chromium.org/6287040 TBR=glider@chromium.org Review URL: http://codereview.chromium.org/6392044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73266 0039d316-1c4b-4281-b951-d872f2087c98
* Check that uncompressed data passed to zlib is defined, and mark compressionglider@chromium.org2011-02-011-0/+8
| | | | | | | | | | | | | | | | result as defined. This way, we suppress benign reports from zlib (see http://www.zlib.net/zlib_faq.html#faq36), without losing coverage of spdy code. This patch was prepared by eugenis@chromium.org (doesn't have a committer access yet) and reviewed at http://codereview.chromium.org/6310016/ BUG=70098 TEST=run automated_ui_tests with random action lists under Valgrind for a few hours at least. TBR=wtc Review URL: http://codereview.chromium.org/6287040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73265 0039d316-1c4b-4281-b951-d872f2087c98
* FTP: fix directory listing parser when server fails to separate the first ↵phajdan.jr@chromium.org2011-02-012-4/+11
| | | | | | | | | | | two columns. BUG=70394 TEST=net_unittests Review URL: http://codereview.chromium.org/6396005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73261 0039d316-1c4b-4281-b951-d872f2087c98
* net: Add namespace net to Sdch* classes.tfarina@chromium.org2011-02-016-63/+94
| | | | | | | | | BUG=64263 TEST=compiled locally and trybots Review URL: http://codereview.chromium.org/6347033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73249 0039d316-1c4b-4281-b951-d872f2087c98
* Rename Real* to Double* in values.* and dependent filesarv@chromium.org2011-02-011-4/+4
| | | | | | | | | BUG=None TEST=Compiles and passes all tests Review URL: http://codereview.chromium.org/6248026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73232 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "First steps towards webRequest extension API."mpcomplete@chromium.org2011-01-313-15/+0
| | | | | | | | | | | | | | | Seems to have broken the sync_integration_tests. This reverts commit d6f8d16cd6a5ebdf019c4755e7d42aee8136abf1. TBR=aa BUG=60101 TEST=no Review URL: http://codereview.chromium.org/6287029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73219 0039d316-1c4b-4281-b951-d872f2087c98
* First steps towards webRequest extension API.mpcomplete@chromium.org2011-01-313-0/+15
| | | | | | | | | | | | Only an asynchronous version of onBeforeRequest is implement, with limited data being passed. BUG=60101 TEST=no Review URL: http://codereview.chromium.org/6288014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73196 0039d316-1c4b-4281-b951-d872f2087c98
* Remove obsolete files from 'sources'. This causes needless work on ↵jeanluc@chromium.org2011-01-311-2/+0
| | | | | | | | | | | incremental builds in VS2010. BUG=71130 TEST=Check that Chrome builds. Review URL: http://codereview.chromium.org/6386019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73190 0039d316-1c4b-4281-b951-d872f2087c98
* net: disable DNS lookup tests.agl@chromium.org2011-01-313-51/+1
| | | | | | | | | | | | | These tests have yielded useful data and I'll probably tweak them for the future. However, I want a CL which disables them so that I can merge it into the release branch for M10. BUG=none TEST=net_unittests Review URL: http://codereview.chromium.org/6287023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73189 0039d316-1c4b-4281-b951-d872f2087c98
* net: update False Start blacklist.agl@chromium.org2011-01-311-0/+3
| | | | | | | | | These sites are using Brocade hardware which should be updated in a few months. TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73157 0039d316-1c4b-4281-b951-d872f2087c98
* Require NTLM identity earlyasanka@chromium.org2011-01-312-26/+42
| | | | | | | | | | | Don't wait until we receive an NTLM challenge to request username/password BUG=22845 TEST=net_unittests --gtest_filter=HttpNetworkTransactionTest.NTLMAuth* Review URL: http://codereview.chromium.org/6326016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73150 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 73121 - Remove obsolete files from 'sources'. This causes needless ↵nsylvain@chromium.org2011-01-311-0/+2
| | | | | | | | | | | | | | | | | | work on incremental builds in VS2010. This is breaking clobber builds with this error : e:\b\build\slave\google-chrome-rel-win\build\src\chrome_frame\iids.cc(6) : fatal error C1083: Cannot open include file: 'chrome_tab.h': No such file or directory BUG=71130 TEST=Check that Chrome builds. Review URL: http://codereview.chromium.org/6307018 TBR=jeanluc@chromium.org Review URL: http://codereview.chromium.org/6347032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73124 0039d316-1c4b-4281-b951-d872f2087c98
* Remove obsolete files from 'sources'. This causes needless work on ↵jeanluc@chromium.org2011-01-301-2/+0
| | | | | | | | | | | incremental builds in VS2010. BUG=71130 TEST=Check that Chrome builds. Review URL: http://codereview.chromium.org/6307018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73121 0039d316-1c4b-4281-b951-d872f2087c98
* Add the include <iterator> or change the usage of back_inserter to avoid ↵jeanluc@chromium.org2011-01-301-6/+6
| | | | | | | | | | | compilation errors in Visual Studio 2010. See http://blogs.msdn.com/b/vcblog/archive/2009/05/25/stl-breaking-changes-in-visual-studio-2010-beta-1.aspx for details. BUG=71134 TEST=Run the related tests. Review URL: http://codereview.chromium.org/6260024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73118 0039d316-1c4b-4281-b951-d872f2087c98