Skip to content

fix(config): validate configuration activation #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nijel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(config): validate configuration activation #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions gammu/src/gammu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,20 @@ StateMachine_GetConfig(StateMachineObject *self, PyObject *args, PyObject *kwds)
"UseGlobalDebugFile", Config->UseGlobalDebugFile);
}

static int
StateMachine_ActivateConfig(StateMachineObject *self, int section)
{
if (GSM_GetConfigNum(self->s) <= section) {
GSM_SetConfigNum(self->s, section + 1);
if (GSM_GetConfigNum(self->s) <= section) {
PyErr_Format(PyExc_ValueError, "Maximal configuration storage exceeded");
return 0;
}
}

return 1;
}

static char StateMachine_SetConfig__doc__[] =
"SetConfig(Section, Values)\n\n"
"Sets specified config section.\n\n"
Expand Down Expand Up @@ -688,8 +702,8 @@ StateMachine_SetConfig(StateMachineObject *self, PyObject *args, PyObject *kwds)
}
}

/* Tell Gammu we have configured another section */
GSM_SetConfigNum(self->s, section + 1);
if (!StateMachine_ActivateConfig(self, section))
return NULL;

Py_RETURN_NONE;
}
Expand Down Expand Up @@ -746,8 +760,10 @@ StateMachine_ReadConfig(StateMachineObject *self, PyObject *args, PyObject *kwds
}
Config->UseGlobalDebugFile = FALSE;

/* Tell Gammu we have configured another section */
GSM_SetConfigNum(self->s, dst + 1);
if (!StateMachine_ActivateConfig(self, dst)) {
INI_Free(cfg);
return NULL;
}

INI_Free(cfg);

Expand Down
22 changes: 22 additions & 0 deletions test/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,28 @@


class ConfigTest(unittest.TestCase):
def test_config_sections(self) -> None:
with tempfile.TemporaryDirectory() as temp_dir:
config_file = Path(temp_dir) / "gammurc"
config_file.write_text(
"[gammu4]\nconnection = none\ndevice = /dev/null\n",
encoding="utf-8",
)

state_machine = gammu.StateMachine()
state_machine.ReadConfig(Section=4, Filename=str(config_file))
state_machine.SetConfig(0, state_machine.GetConfig(4))

cfg = state_machine.GetConfig(4)
assert cfg["Connection"] == "none"
assert cfg["Device"] == "/dev/null"

with pytest.raises(
ValueError,
match="Requested configuration not available",
):
state_machine.GetConfig(100)

def test_config_bool(self) -> None:
state_machine = gammu.StateMachine()
state_machine.SetConfig(
Expand Down