Make AccessFSSet representation lowercase, with underscores.

issue #14
landlock-lsm · Sep 5, 2021 · fbe3b00 · fbe3b00
1 parent ec6c6b8
commit fbe3b00
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/landlock/accessfs.go b/landlock/accessfs.go
@@ -6,19 +6,19 @@ import (
 )
 
 var flagNames = []string{
- "Execute",
- "WriteFile",
- "ReadFile",
- "ReadDir",
- "RemoveDir",
- "RemoveFile",
- "MakeChar",
- "MakeDir",
- "MakeReg",
- "MakeSock",
- "MakeFifo",
- "MakeBlock",
- "MakeSym",
+ "execute",
+ "write_file",
+ "read_file",
+ "read_dir",
+ "remove_dir",
+ "remove_file",
+ "make_char",
+ "make_dir",
+ "make_reg",
+ "make_sock",
+ "make_fifo",
+ "make_block",
+ "make_sym",
 }
 
 // AccessFSSet is a set of Landlockable file system access operations.

diff --git a/landlock/accessfs_test.go b/landlock/accessfs_test.go
@@ -30,23 +30,23 @@ func TestPrettyPrint(t *testing.T) {
  want string
  }{
  {a: 0, want: "∅"},
- {a: 0b1111111111111, want: "{Execute,WriteFile,ReadFile,ReadDir,RemoveDir,RemoveFile,MakeChar,MakeDir,MakeReg,MakeSock,MakeFifo,MakeBlock,MakeSym}"},
- {a: 0b1111100000000, want: "{MakeReg,MakeSock,MakeFifo,MakeBlock,MakeSym}"},
- {a: 0b0000011111111, want: "{Execute,WriteFile,ReadFile,ReadDir,RemoveDir,RemoveFile,MakeChar,MakeDir}"},
- {a: ll.AccessFSExecute, want: "{Execute}"},
- {a: ll.AccessFSWriteFile, want: "{WriteFile}"},
- {a: ll.AccessFSReadFile, want: "{ReadFile}"},
- {a: ll.AccessFSReadDir, want: "{ReadDir}"},
- {a: ll.AccessFSRemoveDir, want: "{RemoveDir}"},
- {a: ll.AccessFSRemoveFile, want: "{RemoveFile}"},
- {a: ll.AccessFSMakeChar, want: "{MakeChar}"},
- {a: ll.AccessFSMakeDir, want: "{MakeDir}"},
- {a: ll.AccessFSMakeReg, want: "{MakeReg}"},
- {a: ll.AccessFSMakeSock, want: "{MakeSock}"},
- {a: ll.AccessFSMakeFifo, want: "{MakeFifo}"},
- {a: ll.AccessFSMakeBlock, want: "{MakeBlock}"},
- {a: ll.AccessFSMakeSym, want: "{MakeSym}"},
- {a: ll.AccessFSReadFile | 1<<63, want: "{ReadFile,1<<63}"},
+ {a: 0b1111111111111, want: "{execute,write_file,read_file,read_dir,remove_dir,remove_file,make_char,make_dir,make_reg,make_sock,make_fifo,make_block,make_sym}"},
+ {a: 0b1111100000000, want: "{make_reg,make_sock,make_fifo,make_block,make_sym}"},
+ {a: 0b0000011111111, want: "{execute,write_file,read_file,read_dir,remove_dir,remove_file,make_char,make_dir}"},
+ {a: ll.AccessFSExecute, want: "{execute}"},
+ {a: ll.AccessFSWriteFile, want: "{write_file}"},
+ {a: ll.AccessFSReadFile, want: "{read_file}"},
+ {a: ll.AccessFSReadDir, want: "{read_dir}"},
+ {a: ll.AccessFSRemoveDir, want: "{remove_dir}"},
+ {a: ll.AccessFSRemoveFile, want: "{remove_file}"},
+ {a: ll.AccessFSMakeChar, want: "{make_char}"},
+ {a: ll.AccessFSMakeDir, want: "{make_dir}"},
+ {a: ll.AccessFSMakeReg, want: "{make_reg}"},
+ {a: ll.AccessFSMakeSock, want: "{make_sock}"},
+ {a: ll.AccessFSMakeFifo, want: "{make_fifo}"},
+ {a: ll.AccessFSMakeBlock, want: "{make_block}"},
+ {a: ll.AccessFSMakeSym, want: "{make_sym}"},
+ {a: ll.AccessFSReadFile | 1<<63, want: "{read_file,1<<63}"},
  } {
  got := tc.a.String()
  if got != tc.want {

diff --git a/landlock/config_test.go b/landlock/config_test.go
@@ -18,7 +18,7 @@ func TestConfigString(t *testing.T) {
  },
  {
  cfg: Config{handledAccessFS: ll.AccessFSWriteFile},
- want: "{Landlock V1; HandledAccessFS: {WriteFile}}",
+ want: "{Landlock V1; HandledAccessFS: {write_file}}",
  },
  {
  cfg: V1,