trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1055751 - in /trafficserver/traffic/trunk/proxy/http2: HttpClientSession.cc HttpClientSession.h HttpTransact.cc
Date Thu, 06 Jan 2011 05:56:44 GMT
Author: zwoop
Date: Thu Jan  6 05:56:43 2011
New Revision: 1055751

URL: http://svn.apache.org/viewvc?rev=1055751&view=rev
Log:
TS-613 Removed old NTLM/auth code, which used the old config for transp proxy

Modified:
    trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc
    trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h
    trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc

Modified: trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc?rev=1055751&r1=1055750&r2=1055751&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc Thu Jan  6 05:56:43 2011
@@ -63,8 +63,7 @@ HttpClientSession::HttpClientSession()
     ka_vio(NULL), slave_ka_vio(NULL),
     cur_hook_id(TS_HTTP_LAST_HOOK), cur_hook(NULL),
     cur_hooks(0), backdoor_connect(false), hooks_set(0),
-    //session_based_auth(false), m_bAuthComplete(false), secCtx(NULL), m_active(false)
-    session_based_auth(false), m_bAuthComplete(false), m_active(false)
+    m_active(false)
 {
   memset(user_args, 0, sizeof(user_args));
 }
@@ -89,17 +88,9 @@ HttpClientSession::cleanup()
 #endif
 
   ink_assert(client_vc == 0);
-
   api_hooks.clear();
-
   mutex.clear();
 
-  m_bAuthComplete = false;
-  /*if (secCtx) {
-    acc.abandon_ctx(secCtx);
-    secCtx = NULL;
-  }a*/
-
   if (conn_decrease) {
     HTTP_DECREMENT_DYN_STAT(http_current_client_connections_stat);
     conn_decrease = false;

Modified: trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h?rev=1055751&r1=1055750&r2=1055751&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h Thu Jan  6 05:56:43 2011
@@ -144,11 +144,6 @@ public:
   bool backdoor_connect;
   int hooks_set;
 
-  bool session_based_auth;
-
-  bool m_bAuthComplete;
-  SecurityContext *secCtx;
-
   // for DI. An active connection is one that a request has
   // been successfully parsed (PARSE_DONE) and it remains to
   // be active until the transaction goes through or the client

Modified: trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc?rev=1055751&r1=1055750&r2=1055751&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc Thu Jan  6 05:56:43 2011
@@ -7040,18 +7040,6 @@ HttpTransact::handle_response_keep_alive
   else if (heads->status_get() == HTTP_STATUS_NO_CONTENT) {
     ka_action = KA_CLOSE;
   } else {
-    // for the cache authenticated content feature
-    bool session_auth_close = false;
-
-    if (s->www_auth_content != CACHE_AUTH_NONE
-        && s->state_machine->ua_session->session_based_auth
-        && (s->server_info.keep_alive == HTTP_NO_KEEPALIVE ||
-            (!s->http_config_param->session_auth_cache_keep_alive_enabled &&
s->next_action == SERVE_FROM_CACHE)))
-      session_auth_close = true;
-
-    // Note: the preceding conditions also apply for the use
-    // of chunked encoding.
-
     // Determine if we are going to send either a server-generated or
     // proxy-generated chunked response to the client. If we cannot
     // trust the content-length, we may be able to chunk the response
@@ -7072,7 +7060,7 @@ HttpTransact::handle_response_keep_alive
          (s->current.server->transfer_encoding == HttpTransact::CHUNKED_ENCODING ||
           // we can use chunked encoding if we cannot trust the content
           // length (e.g. no Content-Length and Connection:close in HTTP/1.1 responses)
-          s->hdr_info.trust_response_cl == false) && session_auth_close == false)
||
+          s->hdr_info.trust_response_cl == false)) ||
          // handle serve from cache (read-while-write) case
          (s->source == SOURCE_CACHE && s->hdr_info.trust_response_cl == false)))
{
       s->client_info.receive_chunked_response = true;
@@ -7088,8 +7076,6 @@ HttpTransact::handle_response_keep_alive
         !(s->client_info.receive_chunked_response == true ||
           (s->method == HTTP_WKSIDX_PUSH && s->client_info.keep_alive == HTTP_KEEPALIVE)))
{
       ka_action = KA_CLOSE;
-    } else if (session_auth_close) {
-      ka_action = KA_CLOSE;
     } else {
       ka_action = KA_CONNECTION;
     }
@@ -8038,35 +8024,6 @@ HttpTransact::build_response(State* s, H
                                                      ((s->http_config_param->wuts_enabled)
? (true) : (false)),
                                                      ((s->http_config_param->log_spider_codes)
? (true) : (false)));
   }
-  // NTLM proxy pass-through
-  if ((status_code == HTTP_STATUS_UNAUTHORIZED ||
-       // if build_response is called from
-       // handle_no_cache_operation_on_forward_server_response,
-       // the status_code passed is HTTP_STATUS_NONE
-       (status_code == HTTP_STATUS_NONE &&
-        s->hdr_info.server_response.valid() &&
-        s->hdr_info.server_response.status_get() == HTTP_STATUS_UNAUTHORIZED)) &&
-      !s->http_config_param->reverse_proxy_enabled && !s->http_config_param->transparency_enabled)
{
-    MIMEField *auth_hdr = outgoing_response->field_find(MIME_FIELD_WWW_AUTHENTICATE, MIME_LEN_WWW_AUTHENTICATE);
-
-    if (auth_hdr) {
-      int auth_len;
-      const char *auth_value = auth_hdr->value_get(&auth_len);
-      if (auth_len >= 9 && strncasecmp(auth_value, "Negotiate", 9) == 0) {
-        auth_hdr = auth_hdr->m_next_dup;
-        if (auth_hdr)
-          auth_value = auth_hdr->value_get(&auth_len);
-        else
-          auth_len = 0;
-      }
-      if ((auth_len == 4 && memcmp(auth_value, "NTLM", 4) == 0) ||
-          (auth_len > 5 && memcmp(auth_value, "NTLM ", 5) == 0)) {
-        // Network Analyzer result based on MS ISA
-        outgoing_response->value_set("Proxy-Support", 13, "Session-Based-Authentication",
28);
-        s->state_machine->ua_session->session_based_auth = true;
-      }
-    }
-  }
 
   HttpTransactHeaders::add_server_header_to_response(&s->txn_conf, outgoing_response);
 



Mime
View raw message