Changeset 3f808ca

Timestamp:

2011-12-11T16:38:02Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d717020

Parents:

877686b

Message:

Support HTTP/1.1 redirect status codes and use HTTPS for OAuth setup. This
is required for identi.ca and really should be done for Twitter as well.
Twitter OAuth is still broken though, it seems to disagree about signatures.

Files:

• lib/http_client.c (modified) (6 diffs)
• protocols/twitter/twitter.c (modified) (2 diffs)

lib/http_client.c

@@ -69 +69 @@
         req->request_length = strlen( request );
         req->redir_ttl = 3;
+        
+        if( getenv( "BITLBEE_DEBUG" ) )
+                printf( "About to send HTTP request:\n%s\n", req->request );
         
         return( req );
@@ -280 +283 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "HTTP response headers:\n%s", req->reply_headers );
+                printf( "HTTP response headers:\n%s\n", req->reply_headers );
         
         if( evil_server )
@@ -320 +323 @@
         }
         
-        if( ( req->status_code >= 301 && req->status_code <= 303 ) && req->redir_ttl-- > 0 )
+        if( ( ( req->status_code >= 301 && req->status_code <= 303 ) ||
+              req->status_code == 307 ) && req->redir_ttl-- > 0 )
         {
                 char *loc, *new_request, *new_host;
@@ -391 +395 @@
                            Always perform a GET request unless we received a 301. 303 was
                            meant for this but it's HTTP/1.1-only and we're specifically
-                           speaking HTTP/1.0. */
-                        new_method = req->status_code != 301 || req->request[0] == 'G' ? "GET" : "POST";
+                           speaking HTTP/1.0. ...
+                           
+                           Well except someone at identi.ca's didn't bother reading any
+                           RFCs and just return HTTP/1.1-specific status codes to HTTP/1.0
+                           requests. Fuckers. So here we are, handle 301..303,307. */
+                        if( strncmp( req->request, "GET", 3 ) == 0 )
+                                /* GETs never become POSTs. */
+                                new_method = "GET";
+                        else if( req->status_code == 302 || req->status_code == 303 )
+                                /* 302 de-facto becomes GET, 303 as specified by RFC 2616#10.3.3 */
+                                new_method = "GET";
+                        else
+                                /* 301 de-facto should stay POST, 307 specifally RFC 2616#10.3.8 */
+                                new_method = "POST";
                         
                         /* Okay, this isn't fun! We have to rebuild the request... :-( */
@@ -419 +435 @@
                 
                 if( getenv( "BITLBEE_DEBUG" ) )
-                        printf( "New headers for redirected HTTP request:\n%s", new_request );
+                        printf( "New headers for redirected HTTP request:\n%s\n", new_request );
         
                 if( new_proto == PROTO_HTTPS )
@@ -463 +479 @@
         
         if( getenv( "BITLBEE_DEBUG" ) && req )
-                printf( "Finishing HTTP request with status: %s",
+                printf( "Finishing HTTP request with status: %s\n",
                         req->status_string ? req->status_string : "NULL" );
         

protocols/twitter/twitter.c

@@ -93 +93 @@
 
 static const struct oauth_service twitter_oauth = {
-        "http://api.twitter.com/oauth/request_token",
-        "http://api.twitter.com/oauth/access_token",
+        "https://api.twitter.com/oauth/request_token",
+        "https://api.twitter.com/oauth/access_token",
         "https://api.twitter.com/oauth/authorize",
         .consumer_key = "xsDNKJuNZYkZyMcu914uEA",
@@ -101 +101 @@
 
 static const struct oauth_service identica_oauth = {
-        "http://identi.ca/api/oauth/request_token",
-        "http://identi.ca/api/oauth/access_token",
+        "https://identi.ca/api/oauth/request_token",
+        "https://identi.ca/api/oauth/access_token",
         "https://identi.ca/api/oauth/authorize",
         .consumer_key = "e147ff789fcbd8a5a07963afbb43f9da",