提交: ff22ffee441b73747ecf7b6646aea23d5226069e - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• 修订版: ff22ffee441b73747ecf7b6646aea23d5226069e (tree)
• 时间: 2023-04-02 21:42:16
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

WorkBackuup

更改概述

• modified: src/config.h
• modified: src/hvctl.c
• modified: src/localexec.c
• modified: src/settingfile.c
• modified: src/test_settingfile.c
• modified: src/tuihvisor.c
• modified: src/vmtui.h

差异

--- a/src/config.h
+++ b/src/config.h
@@ -40,6 +40,7 @@
 #define	SHELL_DEFAULT_PATH_LEN		7
 #define	OPENSSH_DEFAULT_PATH		"/usr/bin/ssh"
 #define	SUDO_DEFAULT_PATH			"/usr/local/bin/sudo"
+#define	SUDO_DEFAULT_PATH_LEN		19
 #define	VNCVIEWER_DEFAULT_PATH		"/usr/local/bin/vncviewer"
 #define	XTERMINAL_DEFAULT_PATH		"/usr/local/bin/xterm"
 #define	VMBHYVE_DEFAULT_PATH		"/usr/local/sbin/vm"

--- a/src/hvctl.c
+++ b/src/hvctl.c
@@ -47,11 +47,11 @@ int
 		i_len	= snprintf( p_hvcon->sudo.str_cmdline, VMTUI_SUDO_MAXLEN_CMDLINE,
 						"echo %s | sudo -S -p \"\" %s ",
 						p_hvisor->sudo.str_password,
-						p_hvisor->sudo.str_option );
+						p_hvisor->sudo.option.str_option );
 	}
 	else	{
 		i_len	= snprintf( p_hvcon->sudo.str_cmdline, VMTUI_SUDO_MAXLEN_CMDLINE,
-						"sudo %s ", p_hvisor->sudo.str_option );
+						"sudo %s ", p_hvisor->sudo.option.str_option );
 	}
 
 	p_hvcon->sudo.sz_len	= (size_t)i_len;
@@ -371,8 +371,10 @@ int
 		p_hvisor->sudo.path.i_len	= strnlen( pstr_path, VMTUI_CMDINFO_MAXLEN_PATH );
 		strncpy( p_hvisor->sudo.path.str_path, pstr_path, VMTUI_CMDINFO_MAXLEN_PATH );
 	}
-	if( NULL != pstr_option )
-		{ strncpy( p_hvisor->sudo.str_option, pstr_option, VMTUI_SUDO_MAXLEN_OPTION ); }
+	if( NULL != pstr_option )	{
+		p_hvisor->sudo.option.i_len	= strnlen( pstr_option, VMTUI_CMDINFO_MAXLEN_OPTION );
+		strncpy( p_hvisor->sudo.option.str_option, pstr_option, VMTUI_CMDINFO_MAXLEN_OPTION );
+	}
 	if( NULL != pstr_password )
 		{ strncpy( p_hvisor->sudo.str_password, pstr_password, VMTUI_SUDO_MAXLEN_PASSWORD ); }
 

--- a/src/localexec.c
+++ b/src/localexec.c
@@ -467,8 +467,9 @@ int
 
 	gt_local_sudo.t_sudo.path.i_len	= strnlen( SUDO_DEFAULT_PATH, VMTUI_CMDINFO_MAXLEN_PATH - 1 );
 	strncpy( gt_local_sudo.t_sudo.path.str_path, SUDO_DEFAULT_PATH, VMTUI_CMDINFO_MAXLEN_PATH );
-	gt_local_sudo.t_sudo.str_password[0]	= '\0';
-	gt_local_sudo.t_sudo.str_option[0]		= '\0';
+	gt_local_sudo.t_sudo.str_password[0]		= '\0';
+	gt_local_sudo.t_sudo.option.i_len			= 0;
+	gt_local_sudo.t_sudo.option.str_option[0]	= '\0';
 	//gt_local_sudo.t_cmd.sz_len				= 0;
 	//gt_local_sudo.t_cmd.str_cmdline[0]		= '\0';
 

--- a/src/settingfile.c
+++ b/src/settingfile.c
@@ -269,8 +269,16 @@ int
 		}
 	}
 	else if( !strncmp( pstr_key, SETFILE_KEY_GLOBAL_SUDO_OPTION, i_keylen ))	{
-		strncpy( gt_local_sudo.t_sudo.str_option, pstr_val, VMTUI_SUDO_MAXLEN_OPTION );
-		i_ret++;
+		i_len	= strnlen( pstr_val, VMTUI_CMDINFO_MAXLEN_OPTION );
+		if( i_len < VMTUI_CMDINFO_MAXLEN_OPTION )	{
+			gt_local_sudo.t_sudo.option.i_len	= i_len;
+			strncpy( gt_local_sudo.t_sudo.option.str_option, pstr_val, VMTUI_CMDINFO_MAXLEN_OPTION );
+			i_ret++;
+		}
+		else	{
+			ErrInfo_Warn( "Can't set sudo command option because of over length.",
+							0x00, 0x00, 0x00, 0x00, i_len, 0x00, pstr_val );
+		}
 	}
 	else if( !strncmp( pstr_key, SETFILE_KEY_GLOBAL_SUDO_PASSWORD, i_keylen ))	{
 		strncpy( gt_local_sudo.t_sudo.str_password, pstr_val, VMTUI_SUDO_MAXLEN_PASSWORD );
@@ -402,8 +410,12 @@ int
 	}
 
 	else if( !strncmp( pstr_key, SETFILE_KEY_SERVER_SUDO_OPTION, i_keylen ))	{
-		strncpy( p_hvtmp->sudo.str_option, pstr_val, VMTUI_SUDO_MAXLEN_OPTION );
-		i_ret++;
+		i_len	= strnlen( pstr_val, VMTUI_CMDINFO_MAXLEN_OPTION );
+		if( i_len < VMTUI_CMDINFO_MAXLEN_OPTION )	{
+			strncpy( p_hvtmp->sudo.option.str_option, pstr_val, VMTUI_CMDINFO_MAXLEN_OPTION );
+			p_hvtmp->sudo.option.i_len	= i_len;
+			i_ret++;
+		}
 	}
 		
 	else if( !strncmp( pstr_key, SETFILE_KEY_SERVER_SUDO_PASSWORD, i_keylen ))	{
@@ -420,17 +432,6 @@ int
 		}
 	}
 
-	/*
-	else if( !strncmp( pstr_key, SETFILE_KEY_SERVER_SSH_CMDOPTION, i_keylen ))	{
-		i_len	= strnlen( pstr_val, VMTUI_CMDINFO_MAXLEN_OPTION );
-		if( i_len < VMTUI_CMDINFO_MAXLEN_OPTION )	{
-			strncpy( p_hvtmp->sshcmd.option.str_option, pstr_val, VMTUI_CMDINFO_MAXLEN_OPTION );
-			p_hvtmp->sshcmd.option.i_len	= i_len;
-			i_ret++;
-		}
-	}
-	*/
-
 	return i_ret;
 }
 
@@ -501,7 +502,7 @@ int
 		i_err	= HvCtl_SetSudoInfo(
 						i_hvisor,
 						p_hvtmp->sudo.path.str_path,
-						p_hvtmp->sudo.str_option,
+						p_hvtmp->sudo.option.str_option,
 						p_hvtmp->sudo.str_password );
 		if( 0x00 != i_err )	{
 			ErrInfo_Warn( "Can't Regist HVisor Sudo Info.",
@@ -554,8 +555,10 @@ int
 		gt_local_sudo.t_sudo.path.i_len	= p_hvisor->sudo.path.i_len;
 		strncpy( gt_local_sudo.t_sudo.path.str_path,
 					p_hvisor->sudo.path.str_path, VMTUI_CMDINFO_MAXLEN_PATH );
-		strncpy( gt_local_sudo.t_sudo.str_option,
-					p_hvisor->sudo.str_option, VMTUI_SUDO_MAXLEN_OPTION );
+
+		gt_local_sudo.t_sudo.option.i_len	= p_hvisor->sudo.option.i_len;
+		strncpy( gt_local_sudo.t_sudo.option.str_option,
+					p_hvisor->sudo.option.str_option, VMTUI_SUDO_MAXLEN_OPTION );
 
 		if( HVISOR_OPTION_SUDO_PASSWORD & p_hvisor->dw_option )	{
 			gt_local_sudo.b_flag	|= LOCALEXEC_SUDO_FLAG_USEPASSWORD;

--- a/src/test_settingfile.c
+++ b/src/test_settingfile.c
@@ -113,7 +113,7 @@ void
 	gt_xterminal.option.i_len			= 0;
 
 	gt_local_sudo.b_flag					= LOCALEXEC_SUDO_FLAG_NONE;
-	gt_local_sudo.t_sudo.str_option[0]		= '\0';
+	gt_local_sudo.t_sudo.option.str_option[0]	= '\0';
 	gt_local_sudo.t_sudo.str_password[0]	= '\0';
 
 	SettingFile_SetSettingFilePath( "./testfile", "test_vmtui.conf" );
@@ -144,7 +144,8 @@ void
 	CU_ASSERT( gt_local_sudo.b_flag & LOCALEXEC_SUDO_FLAG_USEPASSWORD );
 	CU_ASSERT( gt_local_sudo.t_sudo.path.i_len == 13 );
 	CU_ASSERT_STRING_EQUAL( gt_local_sudo.t_sudo.path.str_path, "/usr/bin/sudo" );
-	CU_ASSERT_STRING_EQUAL( gt_local_sudo.t_sudo.str_option, "-opt3" );
+	CU_ASSERT( gt_local_sudo.t_sudo.option.i_len == 5 );
+	CU_ASSERT_STRING_EQUAL( gt_local_sudo.t_sudo.option.str_option, "-opt3" );
 	CU_ASSERT_STRING_EQUAL( gt_local_sudo.t_sudo.str_password, "testpass" );
 
 	// Test HyperVisor Section ====
@@ -168,8 +169,10 @@ void
 			CU_ASSERT( p_hvisor->sshcmd.option.i_len == 0 );
 			CU_ASSERT_STRING_EQUAL( p_hvisor->sshcmd.option.str_option, "" );
 
+			CU_ASSERT( p_hvisor->sudo.path.i_len == 0 );
 			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.path.str_path, "" );
-			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.str_option, "" );
+			CU_ASSERT( p_hvisor->sudo.option.i_len == 0 );
+			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.option.str_option, "" );
 			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.str_password, "" );
 
 			CU_ASSERT( p_hvisor->dw_type == (HVISOR_TYPE_BHYVE_DIRECTBHYVE) );
@@ -200,8 +203,10 @@ void
 			CU_ASSERT( p_hvisor->dw_option & HVISOR_OPTION_SUDO );
 			CU_ASSERT( p_hvisor->dw_option & HVISOR_OPTION_SUDO_PASSWORD );
 
+			CU_ASSERT( p_hvisor->sudo.path.i_len == 10 );
 			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.path.str_path, "/test/sudo" );
-			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.str_option, "-a -b" );
+			CU_ASSERT( p_hvisor->sudo.option.i_len == 5 );
+			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.option.str_option, "-a -b" );
 			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.str_password, "password2" );
 			i_cnt++;
 		}
@@ -226,8 +231,10 @@ void
 			CU_ASSERT( p_hvisor->dw_option & HVISOR_OPTION_SUDO );
 			CU_ASSERT( ! (p_hvisor->dw_option & HVISOR_OPTION_SUDO_PASSWORD) );
 
+			CU_ASSERT( p_hvisor->sudo.path.i_len == SUDO_DEFAULT_PATH_LEN );
 			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.path.str_path, SUDO_DEFAULT_PATH );
-			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.str_option, "" );
+			CU_ASSERT( p_hvisor->sudo.option.i_len == 0 );
+			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.option.str_option, "" );
 			CU_ASSERT_STRING_EQUAL( p_hvisor->sudo.str_password, "" );
 			i_cnt++;
 		}

--- a/src/tuihvisor.c
+++ b/src/tuihvisor.c
@@ -232,9 +232,9 @@ int
 		TextBuf_AppendLine( &lt_hvisor.t_textbuf, "  sudo Command Settings", 0, NULL );
 
 		// sudo options -
-		if( '\0' != p_hvisor->sudo.str_option[0] )	{
+		if( '\0' != p_hvisor->sudo.option.str_option[0] )	{
 			snprintf( str_temp, sizeof( str_temp ), "    %-20s: %-40s",
-							"sudo option", p_hvisor->sudo.str_option );
+							"sudo option", p_hvisor->sudo.option.str_option );
 		} else	{
 			snprintf( str_temp, sizeof( str_temp ), "    %-20s: %-40s",
 							"sudo option", "(no setting)" );

--- a/src/vmtui.h
+++ b/src/vmtui.h
@@ -92,12 +92,15 @@ typedef struct	{
 #define	VMTUI_SUDO_MAXLEN_PASSWORD	64
 
 typedef	struct	{
-	char	str_option[VMTUI_SUDO_MAXLEN_OPTION];
 	char	str_password[VMTUI_SUDO_MAXLEN_PASSWORD];
 	struct	{
 		char	str_path[VMTUI_CMDINFO_MAXLEN_PATH];
 		int		i_len;
 	} path;
+	struct	{
+		char	str_option[VMTUI_CMDINFO_MAXLEN_OPTION];
+		int		i_len;
+	} option;
 } SuDo_Info;
 
 typedef	struct	{