openkylin
/
kylin-system-updater
mirror of https://gitee.com/openkylin/kylin-system-updater.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

update词条

This commit is contained in:
Xueyi Luo 2022-05-31 14:06:37 +08:00
parent b2bad8561c
commit cb4eec803b
5 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/SystemUpdater/Core/DataAcquisition.py
View File

@ -128,7 +128,7 @@ class UpdateMsgCollector():
json_UploadMessage = self.convertor.dictConvertJson(UploadMessage)
logging.debug('Generate UploadMessage: %s.',json_UploadMessage)
logging.info('Generate UploadMessage: %s.',json_UploadMessage)
self.UploadMessage = UploadMessage.copy()
UploadMessage.clear()
@ -143,7 +143,7 @@ class UpdateMsgCollector():
json_PackageInfo = self.convertor.dictConvertJson(PackageInfo)
logging.debug('Generate PackageInfo: %s.',json_PackageInfo)
logging.info('Generate PackageInfo: %s.',json_PackageInfo)
self.PackageInfo = PackageInfo.copy()
PackageInfo.clear()
@ -310,28 +310,28 @@ class MessageSend():
if retval != 0:
if retval == self.ERR_PARA_FROMAT:
result = "Parameter format error"
logging.debug("Sent : false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
logging.info("Sent Status: false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
elif retval == self.ERR_NO_LOACLTID:
result = "The tid value in packageInfo is abnormal, but the message is saved successfully"
logging.debug("Sent : false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
logging.info("Sent Status: false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
# 将返回的tid保存到本地
key = PackageInfo['packageName']+'_'+PackageInfo['messageType']
self.SaveTid(key, retid)
elif retval == self.ERR_ABNORMAL_SHA:
result = "Abnormal UploadedMessage Sha256"
logging.debug("Sent : false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
logging.info("Sent Status: false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
elif retval == self.ERR_UPLOADMSG_SHA:
result = "Description The UploadedMessageSha256 was decrypted incorrectly"
logging.debug("Sent : false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
logging.info("Sent Status: false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
elif retval == self.ERR_UPLOADMSG_CTS:
result = "The createTimeStamp field of UploadedMessage is abnormal"
logging.debug("Sent : false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
logging.info("Sent Status: false - packageName: %s : result: %s.", PackageInfo['packageName'], result)
# 上传失败写入本地json
if retval != self.ERR_NO_LOACLTID or retval == self.ERR_NO_LOACLTID:
self.WriteToJson(PackageInfo['messageType'], json_PackageInfo, json_UploadMessage, encodeMsg)
elif retval == 0:
result = "Send to server success"
logging.debug("Sent : True - packageName: %s : result: %s.", PackageInfo['packageName'], result)
logging.info("Sent Status: True - packageName: %s : result: %s.", PackageInfo['packageName'], result)
def GetLocalTid(self, key):
# 试图获取本地tid

5
backend/SystemUpdater/UpdateManager.py
View File

@ -27,7 +27,7 @@ from gettext import gettext as _
from SystemUpdater.Core.UpdaterConfigParser import UpgradeConfig
from SystemUpdater.Core.utils import get_broken_details,kill_process
from SystemUpdater.Core.DpkgInstallProgress import LogInstallProgress
from SystemUpdater.Core.utils import deb_verify,PolicyKit_Authority
from SystemUpdater.Core.utils import deb_verify,PolicyKit_Authority,get_proc_from_dbus_name
from .Core.errors import *
from .Core.enums import *
@ -458,8 +458,9 @@ class UpdateManager():
self.dbusController.InstalldebFinished(False,'No such file or directory .','')
return
# 验签提权
sender_name = get_proc_from_dbus_name(sender)
if deb_verify(deb_path) != 0: #验签失败，提权
(status,error_string) = PolicyKit_Authority(_("Kylin System Updater requires authentication to install software packages."),sender)
(status,error_string) = PolicyKit_Authority(get_source_name_from_enum(sender_name)+_(" requires authentication to install software packages."),sender)
if not status:
self.dbusController.InstalldebFinished(False,error_string,'')
return

5
backend/SystemUpdater/UpdateManagerDbus.py
View File

@ -351,7 +351,8 @@ class UpdateManagerDbusController(dbus.service.Object):
@dbus.service.method(UPDATER_DBUS_INTERFACE,in_signature='ass',out_signature='bs',sender_keyword='sender')
def PurgePackages(self,_purge_list,cur_user,sender=None):
try:
(status, details) = PolicyKit_Authority(_("Kylin System Updater requires authentication to uninstall software packages."), sender)
sender_name = get_proc_from_dbus_name(sender)
(status, details) = PolicyKit_Authority(get_source_name_from_enum(sender_name)+_(" requires authentication to uninstall software packages."), sender)
if not status:
self.PurgePackagesFinished(False,details,'')
return False,details
@ -370,7 +371,7 @@ class UpdateManagerDbusController(dbus.service.Object):
logging.warning('PurgePackages In the process of updating or Upgrading...')
return False,'PurgePackages In the process of updating or Upgrading...'
else:
sender_name = get_proc_from_dbus_name(sender)
logging.info(COLORMETHOR_PREFIX+'Method'+COLORLOG_SUFFIX+' DistPurgePackages Sender:%s and purge list is:%s...',sender_name,purge_list)
self._check_prohibit_user(sender_name)

1
backend/po/POTFILES.in
View File

@ -8,3 +8,4 @@ SystemUpdater/Core/OriginFilter.py
SystemUpdater/Core/Database.py
SystemUpdater/UpdateManagerDbus.py
SystemUpdater/Core/utils.py
SystemUpdater/Core/enums.py

28
backend/po/zh_CN.po
View File

@ -2686,3 +2686,31 @@ msgid ""
"Kylin System Updater requires authentication to uninstall software packages."
msgstr "麒麟更新器卸载软件包需要认证"
#: ../SystemUpdater/Core/enums.py:763
msgid "Kylin System Updater"
msgstr "麒麟更新器"
#: ../SystemUpdater/Core/enums.py:609
msgid "Kylin Installer"
msgstr "麒麟安装器"
#: ../SystemUpdater/Core/enums.py:610
msgid "Kylin Uninstaller"
msgstr "麒麟卸载器"
#: ../SystemUpdater/Core/enums.py:611
msgid "Kylin Background Upgrade"
msgstr "静默更新"
#: ../SystemUpdater/Core/enums.py:612
msgid "Kylin Software Center"
msgstr "软件商店"
#: ../SystemUpdater/UpdateManagerDbus.py:355
msgid " requires authentication to uninstall software packages."
msgstr "卸载软件包需要认证"
#. 验签失败，提权
#: ../SystemUpdater/UpdateManager.py:463
msgid " requires authentication to install software packages."
msgstr "安装软件包需要认证"