LeonMMcoset/CMLeonOS
1
0
Fork 0
mirror of https://github.com/Leonmmcoset/CMLeonOS.git synced 2026-03-03 15:30:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: LeonMMcoset:b80c5b45a3b8d9e5687fecd0562deefa303f9bf3
Branches Tags
LeonMMcoset:main
LeonMMcoset:1.0.0-prerelease2 LeonMMcoset:1.0.0-prerelease
...
compare: LeonMMcoset:f19cad7f3ae7866e810ce599e978de42a281d25b
Branches Tags
LeonMMcoset:main
LeonMMcoset:1.0.0-prerelease2 LeonMMcoset:1.0.0-prerelease

2 Commits
b80c5b45a3 ... f19cad7f3a

Author SHA1 Message Date
Leonmmcoset
f19cad7f3a 构建版本1 2026-02-12 00:53:29 +08:00
Leonmmcoset
269c61ffdb 路径bug 2+非法字符检测+Lua os.osversion()函数 2026-02-12 00:22:12 +08:00
11 changed files with 149 additions and 2 deletions
Expand all files Collapse all files

3
BuildTime.ps1 Normal file
View File

@@ -0,0 +1,3 @@
$buildTime = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
$buildTime | Out-File -FilePath "BuildTime.txt" -Encoding UTF8
Write-Host "Build time written to BuildTime.txt: $buildTime"

1
BuildTime.txt Normal file
View File

@@ -0,0 +1 @@
2026-02-12 00:49:53

4
CMLeonOS.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
@@ -70,6 +70,7 @@
<EmbeddedResource Include="font.psf" />
<EmbeddedResource Include="Wallpapers\wallpaper.bmp" />
<EmbeddedResource Include="GitCommit.txt" />
<EmbeddedResource Include="BuildTime.txt" />
<EmbeddedResource Include="LuaApps\*.lua" />
</ItemGroup>
@@ -93,6 +94,7 @@
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="powershell -ExecutionPolicy Bypass -File GenerateGitCommit.ps1" WorkingDirectory="$(MSBuildProjectDirectory)" />
<Exec Command="powershell -ExecutionPolicy Bypass -File BuildTime.ps1" WorkingDirectory="$(MSBuildProjectDirectory)" />
</Target>
</Project>

2
GitCommit.txt
View File

@@ -1 +1 @@
b36e3ba
269c61f

21
Kernel.cs
View File

@@ -43,6 +43,9 @@ namespace CMLeonOS
[IL2CPU.API.Attribs.ManifestResourceStream(ResourceName = "CMLeonOS.GitCommit.txt")]
public static readonly byte[] gitCommitFile;
[IL2CPU.API.Attribs.ManifestResourceStream(ResourceName = "CMLeonOS.BuildTime.txt")]
public static readonly byte[] buildTimeFile;
public static void ShowError(string message)
{
Console.ForegroundColor = ConsoleColor.Red;
@@ -142,6 +145,24 @@ namespace CMLeonOS
_logger.Warning("Kernel", "Git Commit file not found, using 'unknown'");
}
// 读取 Build Time
if (buildTimeFile != null && buildTimeFile.Length > 0)
{
try
{
string buildTime = System.Text.Encoding.UTF8.GetString(buildTimeFile);
_logger.Info("Kernel", $"Build Time: {buildTime}");
}
catch
{
_logger.Warning("Kernel", "Failed to read Build Time");
}
}
else
{
_logger.Warning("Kernel", "Build Time file not found");
}
// 检查env.dat文件是否存在，如果不存在则创建并设置Test环境变量
string envFilePath = @"0:\system\env.dat";
if (!System.IO.File.Exists(envFilePath))

51
System/FileSystem.cs
View File

@@ -14,6 +14,19 @@ namespace CMLeonOS
currentDirectory = @"0:\";
}
private static bool ContainsInvalidChars(string input)
{
char[] invalidChars = { '<', '>', ':', '"', '|', '?', '*' };
foreach (char c in invalidChars)
{
if (input.Contains(c.ToString()))
{
return true;
}
}
return false;
}
public FileSystem(string initialPath)
{
if (string.IsNullOrEmpty(initialPath))
@@ -67,6 +80,12 @@ namespace CMLeonOS
public void MakeDirectory(string path)
{
if (ContainsInvalidChars(path))
{
Console.WriteLine("Error: Directory name contains invalid characters: < > : \" | ?");
return;
}
string fullPath = GetFullPath(path);
try
@@ -363,6 +382,28 @@ namespace CMLeonOS
return currentDirectory;
}
if (path.Length > 255)
{
Console.WriteLine("Error: Path too long (maximum 255 characters)");
return currentDirectory;
}
char[] invalidChars = { '<', '>', ':', '"', '|', '?', '*' };
foreach (char c in invalidChars)
{
if (path.Contains(c.ToString()))
{
Console.WriteLine($"Error: Invalid character in path: '{c}'");
return currentDirectory;
}
}
if (path.Contains("//") || path.Contains("\\\\"))
{
Console.WriteLine("Error: Path contains consecutive slashes");
return currentDirectory;
}
if (path.StartsWith(@"0:\"))
{
return path;
@@ -467,6 +508,16 @@ namespace CMLeonOS
string normalizedPath = path;
while (normalizedPath.Contains("//"))
{
normalizedPath = normalizedPath.Replace("//", "/");
}
while (normalizedPath.Contains("\\\\"))
{
normalizedPath = normalizedPath.Replace("\\\\", "\\");
}
if (normalizedPath.StartsWith("/"))
{
normalizedPath = normalizedPath.Substring(1);

24
System/UserSystem.cs
View File

@@ -53,6 +53,19 @@ namespace CMLeonOS
return Convert.ToBase64String(sha256.GetHash());
}
private static bool ContainsInvalidChars(string input)
{
char[] invalidChars = { '<', '>', ':', '"', '|', '?', '*', '/', '\\' };
foreach (char c in invalidChars)
{
if (input.Contains(c.ToString()))
{
return true;
}
}
return false;
}
public UserSystem()
{
EnsureSysDirectoryExists();
@@ -388,6 +401,17 @@ namespace CMLeonOS
username = global::System.Console.ReadLine();
}
while (ContainsInvalidChars(username))
{
CMLeonOS.UI.TUIHelper.SetColors(global::System.ConsoleColor.Red, global::System.ConsoleColor.Black);
global::System.Console.SetCursorPosition(7, 24);
global::System.Console.Write("Username contains invalid characters: < > : \" | ? / \\ ");
CMLeonOS.UI.TUIHelper.SetColors(global::System.ConsoleColor.White, global::System.ConsoleColor.Black);
global::System.Console.SetCursorPosition(7, 7);
global::System.Console.Write("Username: ");
username = global::System.Console.ReadLine();
}
CMLeonOS.UI.TUIHelper.SetColors(global::System.ConsoleColor.White, global::System.ConsoleColor.Black);
global::System.Console.SetCursorPosition(7, 8);
global::System.Console.Write("Password: ");

12
docs/cmleonos/docs/commands.md
View File

@@ -691,6 +691,18 @@ unalias ll
version
```
**输出：**
```
CMLeonOS v1.0.0 (PreRelease 2) - Git: b80c5b4
Major: 1
Minor: 0
Patch: 0
Type: PreRelease 2
Full Version: 1.0.0-PreRelease 2
Git Commit: b80c5b4
Build Time: 2026-02-12 15:30:45
```
### settings
查看或修改系统设置。

8
interpreter/UniLua/LuaOsLib.cs
View File

@@ -39,6 +39,7 @@ namespace UniLua
new NameFuncPair("base64decrypt", OS_Base64Decrypt),
new NameFuncPair("timerstart", OS_TimerStart),
new NameFuncPair("timerstop", OS_TimerStop),
new NameFuncPair("osversion", OS_Osversion),
new NameFuncPair("tui_drawbox", OS_TUIDrawBox),
new NameFuncPair("tui_drawtext", OS_TUIDrawText),
new NameFuncPair("tui_setcolor", OS_TUISetColor),
@@ -240,6 +241,13 @@ namespace UniLua
return 1;
}
private static int OS_Osversion(ILuaState lua)
{
string version = CMLeonOS.Version.FullVersion;
lua.PushString(version);
return 1;
}
private static int OS_TUIDrawBox(ILuaState lua)
{
int x = (int)lua.L_CheckNumber(1);

6
shell/Commands/Info/Version.cs
View File

@@ -1,11 +1,16 @@
using System;
using IL2CPU.API.Attribs;
namespace CMLeonOS.Commands
{
public static class VersionCommand
{
[ManifestResourceStream(ResourceName = "CMLeonOS.BuildTime.txt")]
private static byte[] buildTimeResource;
public static void ProcessVersion()
{
string buildTime = global::System.Text.Encoding.UTF8.GetString(buildTimeResource);
Console.WriteLine(Version.DisplayVersionWithGit);
Console.WriteLine($"Major: {Version.Major}");
Console.WriteLine($"Minor: {Version.Minor}");
@@ -13,6 +18,7 @@ namespace CMLeonOS.Commands
Console.WriteLine($"Type: {Version.VersionType}");
Console.WriteLine($"Full Version: {Version.FullVersion}");
Console.WriteLine($"Git Commit: {Version.GitCommit}");
Console.WriteLine($"Build Time: {buildTime}");
}
}
}

19
shell/Commands/User/UserCommand.cs
View File

@@ -8,6 +8,19 @@ namespace CMLeonOS.Commands.User
{
private static CMLeonOS.UserSystem userSystem;
private static bool ContainsInvalidChars(string input)
{
char[] invalidChars = { '<', '>', ':', '"', '|', '?', '*', '/', '\\' };
foreach (char c in invalidChars)
{
if (input.Contains(c.ToString()))
{
return true;
}
}
return false;
}
public static void SetUserSystem(CMLeonOS.UserSystem system)
{
userSystem = system;
@@ -80,6 +93,12 @@ namespace CMLeonOS.Commands.User
string password = parts[3];
bool isAdmin = userType == "admin";
if (ContainsInvalidChars(username))
{
showError("Error: Username contains invalid characters: < > : \" | ? / \\");
return;
}
userSystem.AddUser($"{username} {password}", isAdmin);
}
else if (subCommand == "delete")