!84 使用变量控制配置文件的对应关系,解决配置不匹配的问题

Merge pull request !84 from 金方鑫/master
This commit is contained in:
openharmony_ci 2024-10-22 03:39:39 +00:00 committed by Gitee
commit 5d5d1069b1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 10 additions and 100 deletions

View File

@ -18,7 +18,11 @@
"hisysevent_config": [
"//base/security/security_guard/hisysevent.yaml"
],
"features": ["security_guard_enable"],
"features": [
"security_guard_enable",
"security_guard_event_file_source",
"security_guard_model_file_source"
],
"adapted_system_type": [
"standard"
],
@ -61,7 +65,6 @@
"//base/security/security_guard/sa_profile:security_guard.init",
"//base/security/security_guard/oem_property:security_audit_cfg",
"//base/security/security_guard/oem_property:security_guard_cfg",
"//base/security/security_guard/oem_property:real_time_upload_event_cfg",
"//base/security/security_guard/oem_property:config_update_trust_list_cfg",
"//base/security/security_guard/oem_property:config_update_trust_list_cfg",
"//base/security/security_guard/oem_property:security_guard_model_cfg",

View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/security/security_guard/security_guard.gni")
import("//build/ohos.gni")
ohos_prebuilt_etc("security_guard_cfg") {
@ -22,7 +23,7 @@ ohos_prebuilt_etc("security_guard_cfg") {
}
ohos_prebuilt_etc("security_guard_model_cfg") {
source = "hos/security_guard_model.cfg"
source = security_guard_model_file_source
module_install_dir = ""
subsystem_name = "security"
@ -30,7 +31,7 @@ ohos_prebuilt_etc("security_guard_model_cfg") {
}
ohos_prebuilt_etc("security_guard_event_cfg") {
source = "hos/security_guard_event.json"
source = security_guard_event_file_source
module_install_dir = ""
subsystem_name = "security"
@ -45,14 +46,6 @@ ohos_prebuilt_etc("security_audit_cfg") {
part_name = "security_guard"
}
ohos_prebuilt_etc("real_time_upload_event_cfg") {
source = "hos/real_time_upload_event.json"
module_install_dir = ""
subsystem_name = "security"
part_name = "security_guard"
}
ohos_prebuilt_etc("config_update_trust_list_cfg") {
source = "hos/config_update_trust_list.json"
module_install_dir = ""

View File

@ -4,23 +4,5 @@
},
{
"name": "security_guard_model.cfg"
},
{
"name": "signature_rule.json"
},
{
"name": "url_rule.json"
},
{
"name": "local_app_attribute.json"
},
{
"name": "global_app_attribute.json"
},
{
"name": "related_event_analysis.json"
},
{
"name": "real_time_upload_event.json"
}]
}

View File

@ -1,70 +0,0 @@
{
"uploadEvents": [
{
"eventId": "1011009110",
"securityLevel": "fatal",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "1011009113",
"securityLevel": "fatal",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "0x01C000000",
"securityLevel": "fatal",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "0x01C000001",
"securityLevel": "fatal",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "0x01C000002",
"securityLevel": "key",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "0x01C000005",
"securityLevel": "fatal",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "0x012001080",
"securityLevel": "key",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "0x012001086",
"securityLevel": "fatal",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "0x01C000006",
"securityLevel": "fatal",
"maxUploadNums": 1,
"resetMaxUploadNums": false
},
{
"eventId": "0x027000002",
"securityLevel": "key",
"maxUploadNums": 3,
"resetMaxUploadNums": true
},
{
"eventId": "0x027000003",
"securityLevel": "key",
"maxUploadNums": 3,
"resetMaxUploadNums": true
}
]
}

View File

@ -15,4 +15,6 @@ sg_root_dir = "//base/security/security_guard"
fuzz_test_output_path = "security_guard/security_guard"
declare_args() {
security_guard_enable = true
security_guard_event_file_source = "hos/security_guard_event.json"
security_guard_model_file_source = "hos/security_guard_model.cfg"
}