lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Move config file modification checking to the Config superclass

Browse Source 
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
Gabor Mezei
2024-06-28 17:46:44 +02:00
parent 3e2a550f12
commit c5ff33cedf
1 changed files with 16 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
scripts/config.py
View File

@ -129,7 +129,13 @@ class Config:
""" """
if name not in self.settings: if name not in self.settings:
return return
self.settings[name].active = False
setting = self.settings[name]
# Check if modifying the config file
if setting.configfile and setting.active:
setting.configfile.modified = True
setting.active = False
def adapt(self, adapter): def adapt(self, adapter):
"""Run adapter on each known symbol and (de)activate it accordingly. """Run adapter on each known symbol and (de)activate it accordingly.
@ -142,8 +148,12 @@ class Config:
otherwise unset `name` (i.e. make it known but inactive). otherwise unset `name` (i.e. make it known but inactive).
""" """
for setting in self.settings.values(): for setting in self.settings.values():
is_active = setting.active
setting.active = adapter(setting.name, setting.active, setting.active = adapter(setting.name, setting.active,
setting.section) setting.section)
# Check if modifying the config file
if setting.configfile and setting.active != is_active:
setting.configfile.modified = True
def change_matching(self, regexs, enable): def change_matching(self, regexs, enable):
"""Change all symbols matching one of the regexs to the desired state.""" """Change all symbols matching one of the regexs to the desired state."""
@ -152,6 +162,9 @@ class Config:
regex = re.compile('|'.join(regexs)) regex = re.compile('|'.join(regexs))
for setting in self.settings.values(): for setting in self.settings.values():
if regex.search(setting.name): if regex.search(setting.name):
# Check if modifying the config file
if setting.configfile and setting.active != enable:
setting.configfile.modified = True
setting.active = enable setting.active = enable
def is_full_section(section): def is_full_section(section):
@ -565,7 +578,7 @@ class MbedTLSConfig(Config):
"""Read the Mbed TLS configuration file.""" """Read the Mbed TLS configuration file."""
super().__init__() super().__init__()
self.configfile = MbedTLSConfigFile(filename) self.configfile = MbedTLSConfigFile(filename)
self.settings.update({name: Setting(active, name, value, section) self.settings.update({name: Setting(active, name, value, section, self.configfile)
for (active, name, value, section) for (active, name, value, section)
in self.configfile.parse_file()}) in self.configfile.parse_file()})
@ -595,7 +608,7 @@ class CryptoConfig(Config):
"""Read the PSA crypto configuration file.""" """Read the PSA crypto configuration file."""
super().__init__() super().__init__()
self.configfile = CryptoConfigFile(filename) self.configfile = CryptoConfigFile(filename)
self.settings.update({name: Setting(active, name, value, section) self.settings.update({name: Setting(active, name, value, section, self.configfile)
for (active, name, value, section) for (active, name, value, section)
in self.configfile.parse_file()}) in self.configfile.parse_file()})
@ -683,45 +696,6 @@ class MultiConfig(Config):
super().set(name, value) super().set(name, value)
def unset(self, name):
if name in self.settings and self.settings[name].active:
self.settings[name].configfile.modified = True
super().unset(name)
def adapt(self, adapter):
# Determine if the config files will be modified
unmodified = {config for config in [self.mbedtls_configfile, self.crypto_configfile]
if not config.modified}
if unmodified:
for setting in self.settings.values():
if not setting.configfile.modified and \
setting.active != adapter(setting.name, setting.active, setting.section):
setting.configfile.modified = True
unmodified.remove(setting.configfile)
if not unmodified:
break
super().adapt(adapter)
def change_matching(self, regexs, enable):
# Determine if the config files will be modified
if regexs:
regex = re.compile('|'.join(regexs))
unmodified = {config for config in [self.mbedtls_configfile, self.crypto_configfile]
if not config.modified}
if unmodified:
for setting in self.settings.values():
if not setting.configfile.modified and \
setting.active != enable and \
regex.search(setting.name):
setting.configfile.modified = True
unmodified.remove(setting.configfile)
if not unmodified:
break
super().change_matching(regexs, enable)
def write(self, mbedtls_file=None, crypto_file=None): def write(self, mbedtls_file=None, crypto_file=None):
"""Write the whole configuration to the file it was read from. """Write the whole configuration to the file it was read from.