pymobiledevice3 4.23.0__tar.gz → 4.24.1__tar.gz

{pymobiledevice3-4.23.0 → pymobiledevice3-4.24.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.23.0
+Version: 4.24.1
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>

{pymobiledevice3-4.23.0 → pymobiledevice3-4.24.1}/pymobiledevice3/__main__.py

@@ -53,7 +53,7 @@ INVALID_SERVICE_MESSAGE = """Failed to start service. Possible reasons are:
         - Make sure you passed the --rsd option to the subcommand
           https://github.com/doronz88/pymobiledevice3#working-with-developer-tools-ios--170
 
-- Apple removed this service
+- Apple removed this service, or your iOS version does not support it.
 
 - A bug. Please file a bug report:
   https://github.com/doronz88/pymobiledevice3/issues/new?assignees=&labels=&projects=&template=bug_report.md&title=

{pymobiledevice3-4.23.0 → pymobiledevice3-4.24.1}/pymobiledevice3/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '4.23.0'
-__version_tuple__ = version_tuple = (4, 23, 0)
+__version__ = version = '4.24.1'
+__version_tuple__ = version_tuple = (4, 24, 1)
+
+__commit_id__ = commit_id = 'gf2e2de501'

{pymobiledevice3-4.23.0 → pymobiledevice3-4.24.1}/pymobiledevice3/cli/activation.py

@@ -23,7 +23,7 @@ def state(service_provider: LockdownClient):
 
 
 @activation.command(cls=Command)
-@click.option('--now', is_flag=True, help='when --offline is used, dont wait for next nonce cycle')
+@click.option('--now', is_flag=True, help='do not wait for next nonce cycle')
 def activate(service_provider: LockdownClient, now):
     """ Activate device """
     activation_service = MobileActivationService(service_provider)
@@ -36,3 +36,9 @@ def activate(service_provider: LockdownClient, now):
 def deactivate(service_provider: LockdownClient):
     """ Deactivate device """
     MobileActivationService(service_provider).deactivate()
+
+
+@activation.command(cls=Command)
+def itunes(service_provider: LockdownClient):
+    """ Tell the device that it has been connected to iTunes (useful for < iOS 4) """
+    service_provider.set_value(True, key='iTunesHasConnected')

{pymobiledevice3-4.23.0 → pymobiledevice3-4.24.1}/pymobiledevice3/lockdown.py

@@ -11,7 +11,7 @@ from contextlib import contextmanager, suppress
 from enum import Enum
 from functools import wraps
 from pathlib import Path
-from ssl import SSLError, SSLZeroReturnError
+from ssl import SSLError, SSLZeroReturnError, TLSVersion
 from typing import AsyncIterable, Optional
 
 import construct
@@ -169,7 +169,7 @@ class LockdownClient(ABC, LockdownServiceProvider):
 
     @property
     def product_version(self) -> str:
-        return self.all_values.get('ProductVersion')
+        return self.all_values.get('ProductVersion') or '1.0'
 
     @property
     def device_class(self) -> DeviceClass:
@@ -333,6 +333,11 @@ class LockdownClient(ABC, LockdownServiceProvider):
 
         self.session_id = start_session.get('SessionID')
         if start_session.get('EnableSessionSSL'):
+            if (Version(self.product_version) < Version('5.0')) and (self.device_class != DeviceClass.WATCH):
+                # TLS v1 is the protocol required for versions prior to iOS 5
+                self.service.min_ssl_proto = TLSVersion.SSLv3
+                self.service.max_ssl_proto = TLSVersion.TLSv1
+
             with self.ssl_file() as f:
                 try:
                     self.service.ssl_start(f)

{pymobiledevice3-4.23.0 → pymobiledevice3-4.24.1}/pymobiledevice3/service_connection.py

@@ -74,26 +74,6 @@ def parse_plist(payload: bytes) -> dict:
         raise PyMobileDevice3Exception(f'parse_plist invalid data: {payload[:100].hex()}')
 
 
-def create_context(certfile: str, keyfile: Optional[str] = None) -> ssl.SSLContext:
-    """
-    Create an SSL context for a secure connection.
-
-    :param certfile: The path to the certificate file.
-    :param keyfile: The path to the key file (optional).
-    :return: An SSL context object.
-    """
-    context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-    if ssl.OPENSSL_VERSION.lower().startswith('openssl'):
-        context.set_ciphers('ALL:!aNULL:!eNULL:@SECLEVEL=0')
-    else:
-        context.set_ciphers('ALL:!aNULL:!eNULL')
-    context.options |= 0x4  # OPENSSL OP_LEGACY_SERVER_CONNECT (required for legacy iOS devices)
-    context.check_hostname = False
-    context.verify_mode = ssl.CERT_NONE
-    context.load_cert_chain(certfile, keyfile)
-    return context
-
-
 class ServiceConnection:
     """ wrapper for tcp-relay connections """
 
@@ -114,6 +94,11 @@ class ServiceConnection:
         self.reader = None  # type: Optional[asyncio.StreamReader]
         self.writer = None  # type: Optional[asyncio.StreamWriter]
 
+        # SSL/TLS version to be used for connecting to device
+        # TLS v1.2 is supported since iOS 5
+        self.min_ssl_proto = ssl.TLSVersion.TLSv1_2
+        self.max_ssl_proto = ssl.TLSVersion.TLSv1_3
+
     @staticmethod
     def create_using_tcp(hostname: str, port: int, keep_alive: bool = True,
                          create_connection_timeout: int = DEFAULT_TIMEOUT) -> 'ServiceConnection':
@@ -339,6 +324,27 @@ class ServiceConnection:
         """
         await self.aio_sendall(build_plist(d, endianity, fmt))
 
+    def create_ssl_context(self, certfile: str, keyfile: Optional[str] = None) -> ssl.SSLContext:
+        """
+        Create an SSL context for a secure connection.
+
+        :param certfile: The path to the certificate file.
+        :param keyfile: The path to the key file (optional).
+        :return: An SSL context object.
+        """
+        context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        context.minimum_version = self.min_ssl_proto
+        context.maximum_version = self.max_ssl_proto
+        if ssl.OPENSSL_VERSION.lower().startswith('openssl'):
+            context.set_ciphers('ALL:!aNULL:!eNULL:@SECLEVEL=0')
+        else:
+            context.set_ciphers('ALL:!aNULL:!eNULL')
+        context.options |= 0x4  # OPENSSL OP_LEGACY_SERVER_CONNECT (required for legacy iOS devices)
+        context.check_hostname = False
+        context.verify_mode = ssl.CERT_NONE
+        context.load_cert_chain(certfile, keyfile)
+        return context
+
     def ssl_start(self, certfile: str, keyfile: Optional[str] = None) -> None:
         """
         Start an SSL connection.
@@ -346,7 +352,7 @@ class ServiceConnection:
         :param certfile: The path to the certificate file.
         :param keyfile: The path to the key file (optional).
         """
-        self.socket = create_context(certfile, keyfile=keyfile).wrap_socket(self.socket)
+        self.socket = self.create_ssl_context(certfile, keyfile=keyfile).wrap_socket(self.socket)
 
     async def aio_ssl_start(self, certfile: str, keyfile: Optional[str] = None) -> None:
         """
@@ -357,7 +363,7 @@ class ServiceConnection:
         """
         self.reader, self.writer = await asyncio.open_connection(
             sock=self.socket,
-            ssl=create_context(certfile, keyfile=keyfile),
+            ssl=self.create_ssl_context(certfile, keyfile=keyfile),
             server_hostname=''
         )
 

{pymobiledevice3-4.23.0 → pymobiledevice3-4.24.1}/pymobiledevice3/services/mobile_activation.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import dataclasses
+import logging
 import plistlib
 import xml.etree.ElementTree as ET
 from contextlib import closing
@@ -54,13 +55,20 @@ class MobileActivationService:
 
     def __init__(self, lockdown: LockdownServiceProvider) -> None:
         self.lockdown = lockdown
+        self.logger = logging.getLogger(__name__)
 
     @property
     def state(self):
-        return self.send_command('GetActivationStateRequest')['Value']
+        try:
+            return self.send_command('GetActivationStateRequest')['Value']
+        except:  # noqa
+            return self.lockdown.get_value(key='ActivationState')
 
     def wait_for_activation_session(self):
-        blob = self.create_activation_session_info()
+        try:
+            blob = self.create_activation_session_info()
+        except:  # noqa
+            return
         handshake_request_message = blob['HandshakeRequestMessage']
         while handshake_request_message == blob['HandshakeRequestMessage']:
             blob = self.create_activation_session_info()
@@ -81,40 +89,91 @@ class MobileActivationService:
         return ActivationForm(title=title, description=description, fields=fields, server_info=server_info)
 
     def activate(self, skip_apple_id_query: bool = False) -> None:
-        blob = self.create_activation_session_info()
+        if self.state != 'Unactivated':
+            self.logger.error('Device is already activated!')
+            return
+
+        try:
+            blob = self.create_activation_session_info()
+            session_mode = True
+        except:  # noqa
+            session_mode = False
 
         # create drmHandshake request with blob from device
         headers = {'Content-Type': 'application/x-apple-plist'}
         headers.update(DEFAULT_HEADERS)
-        content, headers = self.post(ACTIVATION_DRM_HANDSHAKE_DEFAULT_URL, data=plistlib.dumps(blob), headers=headers)
-
-        activation_info = self.create_activation_info_with_session(content)
-
-        content, headers = self.post(ACTIVATION_DEFAULT_URL, data={'activation-info': plistlib.dumps(activation_info)})
+        if session_mode:
+            content, headers = self.post(ACTIVATION_DRM_HANDSHAKE_DEFAULT_URL, data=plistlib.dumps(blob),
+                                         headers=headers)
+
+        activation_request = {}
+        if session_mode:
+            activation_info = self.create_activation_info_with_session(content)
+        else:
+            activation_info = self.lockdown.get_value(key='ActivationInfo')
+            activation_request.update(
+                {'InStoreActivation': False, 'AppleSerialNumber': self.lockdown.get_value(key='SerialNumber')})
+            if self.lockdown.all_values.get('TelephonyCapability'):
+                req_pair = {'IMEI': 'InternationalMobileEquipmentIdentity',
+                            'MEID': 'MobileEquipmentIdentifier',
+                            'IMSI': 'InternationalMobileSubscriberIdentity',
+                            'ICCID': 'IntegratedCircuitCardIdentity'}
+
+                has_meid = False
+                for k, v in req_pair.items():
+                    lv = self.lockdown.all_values.get(v)
+                    if lv is not None:
+                        activation_request.update({k: lv})
+                        continue
+                    else:
+                        self.logger.warn(f'Unable to get {k} from lockdownd')
+                        if k == 'MEID' and has_meid:
+                            # Something is wrong if both IMEI & MEID is missing
+                            raise MobileActivationException('Unable to obtain both IMEI and MEID')
+
+                    # Either IMEI or MEID, or both
+                    if k == 'IMEI':
+                        has_meid = lv is None
+        activation_request.update({'activation-info': plistlib.dumps(activation_info)})
+
+        content, headers = self.post(ACTIVATION_DEFAULT_URL, data=activation_request)
         content_type = headers['Content-Type']
 
         if content_type == 'application/x-buddyml':
             if skip_apple_id_query:
                 raise MobileActivationException('Device is iCloud locked')
-            activation_form = self._get_activation_form_from_response(content.decode())
-            click.secho(activation_form.title, bold=True)
-            click.secho(activation_form.description)
-            fields = []
-            for field in activation_form.fields:
-                if field.secure:
-                    fields.append(inquirer3.Password(name=field.id, message=f'{field.label}'))
-                else:
-                    fields.append(inquirer3.Text(name=field.id, message=f'{field.label}'))
-            data = inquirer3.prompt(fields)
-            data.update(activation_form.server_info)
-            content, headers = self.post(ACTIVATION_DEFAULT_URL, data=data)
-            content_type = headers['Content-Type']
+            try:
+                activation_form = self._get_activation_form_from_response(content.decode())
+            except:  # noqa
+                raise MobileActivationException('Activation server response is invalid')
+            else:
+                click.secho(activation_form.title, bold=True)
+                click.secho(activation_form.description)
+                fields = []
+                for field in activation_form.fields:
+                    if field.secure:
+                        fields.append(inquirer3.Password(name=field.id, message=f'{field.label}'))
+                    else:
+                        fields.append(inquirer3.Text(name=field.id, message=f'{field.label}'))
+                data = inquirer3.prompt(fields)
+                data.update(activation_form.server_info)
+                content, headers = self.post(ACTIVATION_DEFAULT_URL, data=data)
+                content_type = headers['Content-Type']
 
         assert content_type == 'text/xml'
-        self.activate_with_session(content, headers)
+        if session_mode:
+            self.activate_with_session(content, headers)
+        else:
+            self.activate_with_lockdown(content)
+
+        # set ActivationStateAcknowledged if we succeeded
+        self.lockdown.set_value(True, key='ActivationStateAcknowledged')
 
     def deactivate(self):
-        return self.send_command('DeactivateRequest')
+        try:
+            return self.send_command('DeactivateRequest')
+        except:  # noqa
+            return self.lockdown._request('Deactivate')
 
     def create_activation_session_info(self):
         response = self.send_command('CreateTunnel1SessionInfoRequest')
@@ -130,6 +189,16 @@ class MobileActivationService:
             raise MobileActivationException(f'Mobile activation can not be done due to: {response}')
         return response['Value']
 
+    def activate_with_lockdown(self, activation_record):
+        record = plistlib.loads(activation_record)
+        node = record.get('iphone-activation')
+        if node is None:
+            node = record.get('device-activation')
+        if node is None:
+            raise MobileActivationException('Activation record received is invalid')
+
+        self.lockdown._request('Activate', {'ActivationRecord': node.get('activation-record')})
+
     def activate_with_session(self, activation_record, headers):
         data = {
             'Command': 'HandleActivationInfoWithSessionRequest',

{pymobiledevice3-4.23.0 → pymobiledevice3-4.24.1}/pymobiledevice3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 4.23.0
+Version: 4.24.1
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>