Skip to content
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

Jump to bottom

Update configuration manager for system policy operations (i.e., file and process) #189

Merged
merged 1 commit into from
Jun 29, 2021
Merged

Update configuration manager for system policy operations (i.e., file and process) #189

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
6 changes: 3 additions & 3 deletions src/conf/local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ application:
network-policy-to: "db|file" # db, file
network-policy-dir: "./"
system:
operation-mode: 1 # 1: cronjob | 2: one-time-job
operation-mode: 2 # 1: cronjob | 2: one-time-job
cron-job-time-interval: "0h0m5s" # format: XhYmZs
system-log-from: "db" # db|kubearmor
system-log-file: "./log.json" # file path
Expand All @@ -25,7 +25,7 @@ database:
port: 3306
user: root
password: password
dbname: knoxautopolicy
dbname: accuknox
table-configuration: auto_policy_config
table-network-log: network_log
table-network-policy: network_policy
Expand All @@ -52,4 +52,4 @@ logging:

cilium-hubble:
url: 10.4.41.240
port: 80
port: 80
11 changes: 11 additions & 0 deletions src/config/configManager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ import (
// fromEntities : 256
// all : 511

// system policy types: process : 1
// file : 2
// network : 4
// all : 7

// ====================== //
// == Global Variables == //
// ====================== //
Expand Down Expand Up @@ -125,6 +130,8 @@ func LoadDefaultConfig() {
CronJobTimeInterval: "@every " + viper.GetString("application.system.cron-job-time-interval"),
OneTimeJobTimeSelection: "", // e.g., 2021-01-20 07:00:23|2021-01-20 07:00:25

SysPolicyTypes: 7,

SystemLogFrom: viper.GetString("application.system.system-log-from"),
SystemLogFile: viper.GetString("application.system.system-log-file"),
SystemPolicyTo: viper.GetString("application.system.system-policy-to"),
Expand Down Expand Up @@ -319,6 +326,10 @@ func GetCfgSystemPolicyDir() string {
return CurrentCfg.ConfigSysPolicy.SystemPolicyDir
}

func GetCfgSystemkPolicyTypes() int {
return CurrentCfg.ConfigSysPolicy.SysPolicyTypes
}

func GetCfgSystemLogFilters() []types.SystemLogFilter {
return CurrentCfg.ConfigSysPolicy.SystemLogFilters
}
Expand Down
10 changes: 8 additions & 2 deletions src/libs/mysqlHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,14 +766,15 @@ func AddConfiguration(cfg types.ConfigDB, newConfig types.Configuration) error {
"system_log_file," +
"system_policy_to," +
"system_policy_dir," +
"system_policy_types," +
"system_policy_log_filters," +
"system_policy_proc_fromsource," +
"system_policy_file_fromsource," +

"cluster_info_from," +
"cluster_mgmt_url) " +

"values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
"values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")

if err != nil {
return err
Expand Down Expand Up @@ -835,6 +836,7 @@ func AddConfiguration(cfg types.ConfigDB, newConfig types.Configuration) error {
newConfig.ConfigSysPolicy.SystemLogFile,
newConfig.ConfigSysPolicy.SystemPolicyTo,
newConfig.ConfigSysPolicy.SystemPolicyDir,
newConfig.ConfigSysPolicy.SysPolicyTypes,
sysLogFilters,
newConfig.ConfigSysPolicy.ProcessFromSource,
newConfig.ConfigSysPolicy.FileFromSource,
Expand Down Expand Up @@ -924,6 +926,7 @@ func GetConfigurations(cfg types.ConfigDB, configName string) ([]types.Configura
&cfg.ConfigSysPolicy.SystemLogFile,
&cfg.ConfigSysPolicy.SystemPolicyTo,
&cfg.ConfigSysPolicy.SystemPolicyDir,
&cfg.ConfigSysPolicy.SysPolicyTypes,
&sysLogFiltersByte,
&cfg.ConfigSysPolicy.ProcessFromSource,
&cfg.ConfigSysPolicy.FileFromSource,
Expand Down Expand Up @@ -997,6 +1000,7 @@ func UpdateConfiguration(cfg types.ConfigDB, configName string, updateConfig typ
"system_log_file=?," +
"system_policy_to=?," +
"system_policy_dir=?," +
"system_policy_types=?," +
"system_policy_log_filters=?," +
"system_policy_proc_fromsource=?," +
"system_policy_file_fromsource=?," +
Expand Down Expand Up @@ -1061,6 +1065,7 @@ func UpdateConfiguration(cfg types.ConfigDB, configName string, updateConfig typ
updateConfig.ConfigSysPolicy.SystemLogFile,
updateConfig.ConfigSysPolicy.SystemPolicyTo,
updateConfig.ConfigSysPolicy.SystemPolicyDir,
updateConfig.ConfigSysPolicy.SysPolicyTypes,
sysLogFilters,
updateConfig.ConfigSysPolicy.ProcessFromSource,
updateConfig.ConfigSysPolicy.FileFromSource,
Expand Down Expand Up @@ -1168,7 +1173,7 @@ func CreateTableConfigurationMySQL(cfg types.ConfigDB) error {

tableName := cfg.TableConfiguration

// the number of column --> 28
// the number of column --> 29
query :=
"CREATE TABLE IF NOT EXISTS `" + tableName + "` ( " +
" `id` int NOT NULL AUTO_INCREMENT, " +
Expand Down Expand Up @@ -1199,6 +1204,7 @@ func CreateTableConfigurationMySQL(cfg types.ConfigDB) error {
" `system_log_file` varchar(50) DEFAULT NULL, " +
" `system_policy_to` varchar(50) DEFAULT NULL, " +
" `system_policy_dir` varchar(50) DEFAULT NULL, " +
" `system_policy_types` int DEFAULT NULL, " +
" `system_policy_log_filters` JSON DEFAULT NULL, " +
" `system_policy_proc_fromsource` tinyint(1) DEFAULT '0', " +
" `system_policy_file_fromsource` tinyint(1) DEFAULT '0', " +
Expand Down
19 changes: 15 additions & 4 deletions src/systempolicy/systemPolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ const (
SYS_OP_PROCESS = "Process"
SYS_OP_FILE = "File"

SYS_OP_PROCESS_INT = 1
SYS_OP_FILE_INT = 2

SOURCE_ALL = "ALL" // for fromSource 'off'
)

Expand All @@ -60,6 +63,8 @@ var SystemLogFrom string
var SystemLogFile string
var SystemPolicyTo string

var SystemPolicyTypes int

var SystemLogFilters []types.SystemLogFilter

var ProcessFromSource bool
Expand Down Expand Up @@ -407,6 +412,8 @@ func initSysPolicyDiscoveryConfiguration() {
SystemLogFile = cfg.GetCfgSystemLogFile()
SystemPolicyTo = cfg.GetCfgSystemPolicyTo()

SystemPolicyTypes = cfg.GetCfgSystemkPolicyTypes()

SystemLogFilters = cfg.GetCfgSystemLogFilters()

ProcessFromSource = cfg.GetCfgSystemProcFromSource()
Expand Down Expand Up @@ -459,12 +466,16 @@ func DiscoverSystemPolicyMain() {
}

// 1. discover file operation system policy
fileOpLogs := getOperationLogs(SYS_OP_FILE, perPodlogs)
discoveredSysPolicies = discoverFileOperationPolicy(discoveredSysPolicies, pod, fileOpLogs)
if SystemPolicyTypes&SYS_OP_FILE_INT > 0 {
fileOpLogs := getOperationLogs(SYS_OP_FILE, perPodlogs)
discoveredSysPolicies = discoverFileOperationPolicy(discoveredSysPolicies, pod, fileOpLogs)
}

// 2. discover process operation system policy
procOpLogs := getOperationLogs(SYS_OP_PROCESS, perPodlogs)
discoveredSysPolicies = discoverProcessOperationPolicy(discoveredSysPolicies, pod, procOpLogs)
if SystemPolicyTypes&SYS_OP_PROCESS_INT > 0 {
procOpLogs := getOperationLogs(SYS_OP_PROCESS, perPodlogs)
discoveredSysPolicies = discoverProcessOperationPolicy(discoveredSysPolicies, pod, procOpLogs)
}

// 3. update selector
discoveredSysPolicies = updateSysPolicySelector(clusterName, pod, discoveredSysPolicies)
Expand Down
2 changes: 2 additions & 0 deletions src/types/configData.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ type ConfigSystemPolicy struct {
SystemPolicyTo string `json:"system_policy_to,omitempty" bson:"system_policy_to,omitempty"`
SystemPolicyDir string `json:"system_policy_dir,omitempty" bson:"system_policy_dir,omitempty"`

SysPolicyTypes int `json:"system_policy_types,omitempty" bson:"system_policy_types,omitempty"`

SystemLogFilters []SystemLogFilter `json:"system_policy_log_filters,omitempty" bson:"system_policy_log_filters,omitempty"`

ProcessFromSource bool `json:"system_policy_proc_fromsource,omitempty" bson:"system_policy_proc_fromsource,omitempty"`
Expand Down
4 changes: 2 additions & 2 deletions tests/mysql/init/autopolicy.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CREATE DATABASE IF NOT EXISTS `knoxautopolicy`;
USE `knoxautopolicy`;
CREATE DATABASE IF NOT EXISTS `accuknox`;
USE `accuknox`;