formcat code

super_sign_new
nineven 4 years ago
parent d7a3506230
commit 0d42223af2
  1. 1
      fir_ser/api/migrations/0014_auto_20210129_1600.py
  2. 1
      fir_ser/api/migrations/0015_auto_20210129_1730.py
  3. 3
      fir_ser/api/utils/app/iossignapi.py
  4. 20
      fir_ser/api/utils/app/supersignutils.py
  5. 1
      fir_ser/api/utils/apple/appleapiv3.py

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0013_auto_20210128_1815'),
]

@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0014_auto_20210129_1600'),
]

@ -11,11 +11,13 @@ import os
from api.utils.app.randomstrings import make_app_uuid
import logging
from api.utils.apple.appleapiv3 import AppStoreConnectApi
logger = logging.getLogger(__file__)
import base64
from OpenSSL.SSL import FILETYPE_PEM
from OpenSSL.crypto import (dump_certificate_request, dump_privatekey, PKey, TYPE_RSA, X509Req, dump_certificate)
def exec_shell(cmd, remote=False, timeout=None):
if remote:
hostip = "10.66.6.66"
@ -250,7 +252,6 @@ class AppDeveloperApiV2(object):
result['return_info'] = "%s" % e
return False, result
def get_device(self, user_obj):
result = {}
try:

@ -153,12 +153,14 @@ def get_api_obj(auth):
app_api_obj = None
return app_api_obj
def get_apple_udid_key(auth):
mpkey = auth.get("username")
if auth.get("issuer_id"):
mpkey = auth.get("issuer_id")
return mpkey
def get_http_server_doamin(request):
server_domain = SERVER_DOMAIN.get('POST_UDID_DOMAIN', None)
if not server_domain or not server_domain.startswith("http"):
@ -237,7 +239,8 @@ class IosUtils(object):
app_id = self.app_obj.app_id
device_udid = self.udid_info.get('udid')
device_name = self.udid_info.get('product')
return get_api_obj(self.auth).get_profile(bundleId, app_id, device_udid, device_name, self.get_profile_full_path(),
return get_api_obj(self.auth).get_profile(bundleId, app_id, device_udid, device_name,
self.get_profile_full_path(),
self.auth)
def get_profile_full_path(self):
@ -465,7 +468,8 @@ class IosUtils(object):
if status:
if auth.get("issuer_id"):
cert_id = result.id
AppIOSDeveloperInfo.objects.filter(user_id=user_obj, issuer_id=auth.get("issuer_id")).update(is_actived=True,
AppIOSDeveloperInfo.objects.filter(user_id=user_obj, issuer_id=auth.get("issuer_id")).update(
is_actived=True,
certid=cert_id)
else:
@ -475,11 +479,13 @@ class IosUtils(object):
with open(file_format_path_name + '.info', "r") as f:
cert_info = f.read()
except Exception as e:
logger.error("create_developer_cert developer_obj:%s user_obj:%s delete file failed Exception:%s" % (
logger.error(
"create_developer_cert developer_obj:%s user_obj:%s delete file failed Exception:%s" % (
developer_obj, user_obj, e))
if cert_info:
cert_id = re.findall(r'.*\n\tid=(.*),.*', cert_info)[0].replace('"', '')
AppIOSDeveloperInfo.objects.filter(user_id=user_obj, email=auth.get("username")).update(is_actived=True,
AppIOSDeveloperInfo.objects.filter(user_id=user_obj, email=auth.get("username")).update(
is_actived=True,
certid=cert_id)
return status, result
@ -518,7 +524,8 @@ class IosUtils(object):
UDIDsyncDeveloper.objects.filter(developerid=developer_obj, platform=1).delete()
for devicestr in devices_info.split(">"):
formatdevice = re.findall(r'.*Device id="(.*)",.*name="(.*)",.*udid="(.*?)",.*model=(.*),.*', devicestr)
formatdevice = re.findall(r'.*Device id="(.*)",.*name="(.*)",.*udid="(.*?)",.*model=(.*),.*',
devicestr)
if formatdevice:
device = {
"serial": formatdevice[0][0],
@ -527,7 +534,8 @@ class IosUtils(object):
"version": formatdevice[0][3],
"platform": 1
}
app_udid_obj = UDIDsyncDeveloper.objects.filter(developerid=developer_obj, udid=device.get("udid"))
app_udid_obj = UDIDsyncDeveloper.objects.filter(developerid=developer_obj,
udid=device.get("udid"))
if app_udid_obj:
pass
else:

@ -789,4 +789,3 @@ class AppStoreConnectApi(DevicesAPI, BundleIDsAPI, BundleIDsCapabilityAPI, Profi
if req.status_code == 201:
return self.__certificates_store(req, 201)
raise KeyError(req.text)

Loading…
Cancel
Save