Add 2FA support.

Julian-O · Julian-O · commit 7cb88be3b734 · 2017-08-04T00:45:17.000+10:00
diff --git a/InstagramAPI/base.py b/InstagramAPI/base.py
@@ -44,7 +44,6 @@
 class AuthenticationError(RuntimeError):
     pass
 
-
 class InstagramAPIBase:
 
     API_URL = 'https://i.instagram.com/api/v1/'
@@ -60,6 +59,11 @@ class InstagramAPIBase:
     EXPERIMENTS = 'ig_android_progressive_jpeg,ig_creation_growth_holdout,ig_android_report_and_hide,ig_android_new_browser,ig_android_enable_share_to_whatsapp,ig_android_direct_drawing_in_quick_cam_universe,ig_android_huawei_app_badging,ig_android_universe_video_production,ig_android_asus_app_badging,ig_android_direct_plus_button,ig_android_ads_heatmap_overlay_universe,ig_android_http_stack_experiment_2016,ig_android_infinite_scrolling,ig_fbns_blocked,ig_android_white_out_universe,ig_android_full_people_card_in_user_list,ig_android_post_auto_retry_v7_21,ig_fbns_push,ig_android_feed_pill,ig_android_profile_link_iab,ig_explore_v3_us_holdout,ig_android_histogram_reporter,ig_android_anrwatchdog,ig_android_search_client_matching,ig_android_high_res_upload_2,ig_android_new_browser_pre_kitkat,ig_android_2fac,ig_android_grid_video_icon,ig_android_white_camera_universe,ig_android_disable_chroma_subsampling,ig_android_share_spinner,ig_android_explore_people_feed_icon,ig_explore_v3_android_universe,ig_android_media_favorites,ig_android_nux_holdout,ig_android_search_null_state,ig_android_react_native_notification_setting,ig_android_ads_indicator_change_universe,ig_android_video_loading_behavior,ig_android_black_camera_tab,liger_instagram_android_univ,ig_explore_v3_internal,ig_android_direct_emoji_picker,ig_android_prefetch_explore_delay_time,ig_android_business_insights_qe,ig_android_direct_media_size,ig_android_enable_client_share,ig_android_promoted_posts,ig_android_app_badging_holdout,ig_android_ads_cta_universe,ig_android_mini_inbox_2,ig_android_feed_reshare_button_nux,ig_android_boomerang_feed_attribution,ig_android_fbinvite_qe,ig_fbns_shared,ig_android_direct_full_width_media,ig_android_hscroll_profile_chaining,ig_android_feed_unit_footer,ig_android_media_tighten_space,ig_android_private_follow_request,ig_android_inline_gallery_backoff_hours_universe,ig_android_direct_thread_ui_rewrite,ig_android_rendering_controls,ig_android_ads_full_width_cta_universe,ig_video_max_duration_qe_preuniverse,ig_android_prefetch_explore_expire_time,ig_timestamp_public_test,ig_android_profile,ig_android_dv2_consistent_http_realtime_response,ig_android_enable_share_to_messenger,ig_explore_v3,ig_ranking_following,ig_android_pending_request_search_bar,ig_android_feed_ufi_redesign,ig_android_video_pause_logging_fix,ig_android_default_folder_to_camera,ig_android_video_stitching_7_23,ig_android_profanity_filter,ig_android_business_profile_qe,ig_android_search,ig_android_boomerang_entry,ig_android_inline_gallery_universe,ig_android_ads_overlay_design_universe,ig_android_options_app_invite,ig_android_view_count_decouple_likes_universe,ig_android_periodic_analytics_upload_v2,ig_android_feed_unit_hscroll_auto_advance,ig_peek_profile_photo_universe,ig_android_ads_holdout_universe,ig_android_prefetch_explore,ig_android_direct_bubble_icon,ig_video_use_sve_universe,ig_android_inline_gallery_no_backoff_on_launch_universe,ig_android_image_cache_multi_queue,ig_android_camera_nux,ig_android_immersive_viewer,ig_android_dense_feed_unit_cards,ig_android_sqlite_dev,ig_android_exoplayer,ig_android_add_to_last_post,ig_android_direct_public_threads,ig_android_prefetch_venue_in_composer,ig_android_bigger_share_button,ig_android_dv2_realtime_private_share,ig_android_non_square_first,ig_android_video_interleaved_v2,ig_android_follow_search_bar,ig_android_last_edits,ig_android_video_download_logging,ig_android_ads_loop_count_universe,ig_android_swipeable_filters_blacklist,ig_android_boomerang_layout_white_out_universe,ig_android_ads_carousel_multi_row_universe,ig_android_mentions_invite_v2,ig_android_direct_mention_qe,ig_android_following_follower_social_context'
     SIG_KEY_VERSION = '4'
 
+    class _2FA_Required(Exception):
+        """ Raised and caught internally to the class to indicate Two-Factor Authentication is turned on for login."""
+        def __init__(self, two_factor_info):
+            self.two_factor_info = two_factor_info
+
     def __init__(self, username, password):
         self._loggedinuserid = ''
         self._ranktoken = ''
@@ -170,7 +174,14 @@ def _sendrequest(self, endpoint, post=None, login=False, headers=None):
 
         try:
             response.raise_for_status()
-        except requests.RequestException:
+        except requests.RequestException as re:
+            # Special case for 2FA response:
+            if isinstance(re, requests.HTTPError) and response.status_code == 400:
+                json_dict = json.loads(response.text)
+                if "two_factor_required" in json_dict and json_dict["two_factor_required"]:
+                    LOGGER.info("2FA required.")
+                    raise self._2FA_Required(two_factor_info=json_dict["two_factor_info"])
+
             LOGGER.info("Instagram returned HTTP Error Code %s: (%s)",
                         response.status_code, response.text)
             raise
diff --git a/InstagramAPI/endpoints.py b/InstagramAPI/endpoints.py
@@ -19,7 +19,7 @@
 import copy
 import math
 import sys
-from .base import InstagramAPIBase
+from .base import InstagramAPIBase, AuthenticationError
 
 LOGGER = logging.getLogger('InstagramAPI')
 
@@ -58,8 +58,17 @@ class InstagramAPIEndPoints(InstagramAPIBase):
 
     """
 
-    def __init__(self, username, password):
+    def __init__(self, username, password, two_factor_callback=None):
+        """
+        :param two_factor_callback: a function that takes a dictionary of "two_factor_info", and returns an
+               verification string for logging in. Typically, this function would be prompt the user to enter the text
+               sent via SMS.
+               two_factor_info parameter typically contains the user name, parts of the phone number, a unique
+               identifier, and details about how frequently the requests may be attempted without triggering robocalls
+               or other consequences.
+               """
         InstagramAPIBase.__init__(self, username, password)
+        self._two_factor_callback = two_factor_callback
 
     def auto_complete_user_list(self):
         return self._sendrequest('friendships/autocomplete_user_list/')
@@ -366,6 +375,13 @@ def like(self, media_id):
         return self._sendrequest('media/' + str(media_id) + '/like/', self._generatesignature(data))
 
     def login(self, force=False):
+        """
+            Authenticate this API instance.
+
+            If already logged in (and not later logged out) does nothing (unless forced).
+        :param force: if true, will attempt to log in even if already logged in.
+        :return: dictionary of responses.
+        """
         if not self._isloggedin or force:
             self._session = requests.Session()
             # if you need proxy make something like this:
@@ -382,10 +398,31 @@ def login(self, force=False):
                 'password': self._password,
                 'login_attempt_count': '0'}
 
-            full_response = self._sendrequest(
-                'accounts/login/',
-                post=self._generatesignature(json.dumps(data)),
-                login=True)
+            try:
+                full_response = self._sendrequest(
+                    'accounts/login/',
+                    post=self._generatesignature(json.dumps(data)),
+                    login=True)
+            except InstagramAPIBase._2FA_Required as exception:
+                # In order to login, need to provide the second factor (i.e. SMS code or backup code).
+                # Use call-back to get this string.
+                if not self._two_factor_callback:
+                    raise AuthenticationError("This account requires support for Two-Factor Authentication")
+                two_factor_info = exception.two_factor_info = exception.two_factor_info
+                verification_string = self._two_factor_callback(two_factor_info)
+                data = {
+                    'verification_code': verification_string,
+                    'two_factor_identifier': two_factor_info['two_factor_identifier'],
+                    '_csrftoken': full_response.cookies['csrftoken'],
+                    'username': self._username,
+                    'device_id': self._deviceid,
+                    'password': self._password,
+                }
+
+                full_response = self._sendrequest(
+                    'accounts/two_factor_login/',
+                    post=self._generatesignature(json.dumps(data)),
+                    login=True)
 
             self._isloggedin = True
             decoded_text = json.loads(full_response.text)
diff --git a/InstagramAPI/instagram_api.py b/InstagramAPI/instagram_api.py
@@ -17,8 +17,8 @@ class InstagramAPI(InstagramAPIEndPoints):
     # Make visible to clients for ease of reference.
     AuthenticationError = AuthenticationError
 
-    def __init__(self, username, password):
-        InstagramAPIEndPoints.__init__(self, username, password)
+    def __init__(self, username, password, two_factor_callback=None):
+        InstagramAPIEndPoints.__init__(self, username, password, two_factor_callback)
 
     # Helper functions to gather complete lists/deal with pagination.
 
