Skip to content

Commit

Permalink
Merge pull request #241 from rusan/two_step_verification_support
Browse files Browse the repository at this point in the history 
Two step verification support
  • Loading branch information
@raiym
raiym authored Dec 14, 2017
2 parents 8892265 + 5e257ff commit 3c46194
Showing 1 changed file with 107 additions and 7 deletions.
114 changes: 107 additions & 7 deletions src/InstagramScraper/Instagram.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,8 @@ public function getMediaCommentsByCode($code, $count = 10, $maxId = null)
}

/**
* We work only on https in this case if we have same cookies on Secure and not - we will choice Secure cookie
*
* @param string $rawCookies
*
* @return array
Expand All @@ -410,14 +412,26 @@ private static function parseCookies($rawCookies)
$rawCookies = [$rawCookies];
}

$cookies = [];
foreach ($rawCookies as $c) {
$c = explode(';', $c)[0];
$parts = explode('=', $c);
$not_secure_cookies = [];
$secure_cookies = [];

foreach ($rawCookies as $cookie) {
$cookie_array = 'not_secure_cookies';
$cookie_parts = explode(';', $cookie);
foreach ($cookie_parts as $cookie_part) {
if (trim($cookie_part) == 'Secure') {
$cookie_array = 'secure_cookies';
break;
}
}
$value = array_shift($cookie_parts);
$parts = explode('=', $value);
if (sizeof($parts) >= 2 && !is_null($parts[1])) {
$cookies[$parts[0]] = $parts[1];
${$cookie_array}[$parts[0]] = $parts[1];
}
}

$cookies = $secure_cookies + $not_secure_cookies;
return $cookies;
}

Expand Down Expand Up @@ -963,13 +977,16 @@ public function getStories($reel_ids = null)

/**
* @param bool $force
* @param bool $support_two_step_verification
*
* $support_two_step_verification true works only in cli mode - just run login in cli mode - save cookie to file and use in any mode
*
* @throws InstagramAuthException
* @throws InstagramException
*
* @return array
*/
public function login($force = false)
public function login($force = false, $support_two_step_verification = false)
{
if ($this->sessionUsername == null || $this->sessionPassword == null) {
throw new InstagramAuthException("User credentials not provided");
Expand All @@ -993,7 +1010,9 @@ public function login($force = false)
['username' => $this->sessionUsername, 'password' => $this->sessionPassword]);

if ($response->code !== 200) {
if ((is_string($response->code) || is_numeric($response->code)) && is_string($response->body)) {
if ($response->code === 400 && isset($response->body->message) && $response->body->message == 'checkpoint_required' && $support_two_step_verification) {
$response = $this->verifyTwoStep($response, $cookies);
} elseif ((is_string($response->code) || is_numeric($response->code)) && is_string($response->body)) {
throw new InstagramAuthException('Response code is ' . $response->code . '. Body: ' . $response->body . ' Something went wrong. Please report issue.');
} else {
throw new InstagramAuthException('Something went wrong. Please report issue.');
Expand All @@ -1018,6 +1037,87 @@ public function login($force = false)
return $this->generateHeaders($this->userSession);
}

private function verifyTwoStep($response, $cookies)
{
$new_cookies = static::parseCookies($response->headers['Set-Cookie']);
$cookies = array_merge($cookies, $new_cookies);
$cookie_string = '';
foreach ($cookies as $name => $value) {
$cookie_string .= $name . "=" . $value . "; ";
}
$headers = [
'cookie' => $cookie_string,
'referer' => Endpoints::LOGIN_URL,
'x-csrftoken' => $cookies['csrftoken']
];

$url = Endpoints::BASE_URL . $response->body->checkpoint_url;
$response = Request::get($url, $headers);
if (preg_match('/window._sharedData\s\=\s(.*?)\;<\/script>/', $response->raw_body, $matches)) {
$data = json_decode($matches[1], true, 512, JSON_BIGINT_AS_STRING);
if (!empty($data['entry_data']['Challenge'][0]['extraData']['content'][3]['fields'][0]['values'])) {
$choices = $data['entry_data']['Challenge'][0]['extraData']['content'][3]['fields'][0]['values'];
} elseif (!empty($data['entry_data']['Challenge'][0]['fields'])) {
$fields = $data['entry_data']['Challenge'][0]['fields'];
if (!empty($fields['email'])) {
$choices[] = ['label' => 'Email: ' . $fields['email'], 'value' => 1];
}
if (!empty($fields['phone_number'])) {
$choices[] = ['label' => 'Phone: ' . $fields['phone_number'], 'value' => 0];
}
}

if (!empty($choices)) {
if (count($choices) > 1) {
$possible_values = [];
print "Select where to send security code\n";
foreach ($choices as $choice) {
print $choice['label'] . " - " . $choice['value'] . "\n";
$possible_values[$choice['value']] = true;
}

$selected_choice = null;
while (empty($possible_values[$selected_choice])) {
if ($selected_choice) {
print "Wrong choice. Try again\n";
}
print "Your choice: ";
$selected_choice = trim(fgets(STDIN));
}
} else {
print "Message with security code sent to: " . $choices[0]['label'] . "\n";
$selected_choice = $choices[0]['value'];
}
$response = Request::post($url, $headers, ['choice' => $selected_choice]);
}
}

if (!preg_match('/name="security_code"/', $response->raw_body, $matches)) {
throw new InstagramAuthException('Something went wrong when try two step verification. Please report issue.');
}

$security_code = null;
while (strlen($security_code) != 6 && !is_int($security_code)) {
if ($security_code) {
print "Wrong security code\n";
}
print "Enter security code: ";
$security_code = trim(fgets(STDIN));
}
$post_data = [
'csrfmiddlewaretoken' => $cookies['csrftoken'],
'verify' => 'Verify Account',
'security_code' => $security_code,
];

$response = Request::post($url, $headers, $post_data);
if ($response->code !== 200) {
throw new InstagramAuthException('Something went wrong when try two step verification and enter security code. Please report issue.');
}

return $response;
}

/**
* @param $session
*
Expand Down

0 comments on commit 3c46194

Please sign in to comment.