mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-12-26 18:14:22 +00:00
c0c7037e18
It was possible for execution to reach the end of the rulesFromJsonV4 method without returning. This was causing a crash on OS X when parsing rules inside an instance.
89 lines
2.3 KiB
C++
89 lines
2.3 KiB
C++
/* Copyright 2013 MultiMC Contributors
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <QJsonObject>
|
|
#include <QJsonArray>
|
|
|
|
#include "OneSixRule.h"
|
|
|
|
QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules)
|
|
{
|
|
QList<std::shared_ptr<Rule>> rules;
|
|
auto rulesVal = objectWithRules.value("rules");
|
|
if (!rulesVal.isArray())
|
|
return rules;
|
|
|
|
QJsonArray ruleList = rulesVal.toArray();
|
|
for (auto ruleVal : ruleList)
|
|
{
|
|
std::shared_ptr<Rule> rule;
|
|
if (!ruleVal.isObject())
|
|
continue;
|
|
auto ruleObj = ruleVal.toObject();
|
|
auto actionVal = ruleObj.value("action");
|
|
if (!actionVal.isString())
|
|
continue;
|
|
auto action = RuleAction_fromString(actionVal.toString());
|
|
if (action == Defer)
|
|
continue;
|
|
|
|
auto osVal = ruleObj.value("os");
|
|
if (!osVal.isObject())
|
|
{
|
|
// add a new implicit action rule
|
|
rules.append(ImplicitRule::create(action));
|
|
continue;
|
|
}
|
|
|
|
auto osObj = osVal.toObject();
|
|
auto osNameVal = osObj.value("name");
|
|
if (!osNameVal.isString())
|
|
continue;
|
|
OpSys requiredOs = OpSys_fromString(osNameVal.toString());
|
|
QString versionRegex = osObj.value("version").toString();
|
|
// add a new OS rule
|
|
rules.append(OsRule::create(action, requiredOs, versionRegex));
|
|
}
|
|
return rules;
|
|
}
|
|
|
|
QJsonObject ImplicitRule::toJson()
|
|
{
|
|
QJsonObject ruleObj;
|
|
ruleObj.insert("action", m_result == Allow ? QString("allow") : QString("disallow"));
|
|
return ruleObj;
|
|
}
|
|
|
|
QJsonObject OsRule::toJson()
|
|
{
|
|
QJsonObject ruleObj;
|
|
ruleObj.insert("action", m_result == Allow ? QString("allow") : QString("disallow"));
|
|
QJsonObject osObj;
|
|
{
|
|
osObj.insert("name", OpSys_toString(m_system));
|
|
osObj.insert("version", m_version_regexp);
|
|
}
|
|
ruleObj.insert("os", osObj);
|
|
return ruleObj;
|
|
}
|
|
|
|
RuleAction RuleAction_fromString(QString name)
|
|
{
|
|
if (name == "allow")
|
|
return Allow;
|
|
if (name == "disallow")
|
|
return Disallow;
|
|
return Defer;
|
|
} |