OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patch from mantis #610, fixed invalid filenames with dump_assets_to_file set to true. thanks tyre.

0.6.0-stable
MW 2008-03-12 15:45:56 +00:00
parent be6d8f6d9a
commit 2fea38a5f2
2 changed files with 56 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -553,7 +553,7 @@ namespace OpenSim.Region.Capabilities
{ {
Directory.CreateDirectory(assetPath); Directory.CreateDirectory(assetPath);
} }
FileStream fs = File.Create(Path.Combine(assetPath, filename)); FileStream fs = File.Create(Path.Combine(assetPath, Util.safeFileName(filename)));
BinaryWriter bw = new BinaryWriter(fs); BinaryWriter bw = new BinaryWriter(fs);
bw.Write(data); bw.Write(data);
bw.Close(); bw.Close();

81
OpenSim/Framework/Util.cs
View File

@ -37,8 +37,8 @@ using System.Text;
using libsecondlife; using libsecondlife;
using Nini.Config; using Nini.Config;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
public class Util public class Util
@ -48,7 +48,13 @@ namespace OpenSim.Framework
private static object XferLock = new object(); private static object XferLock = new object();
private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>(); private static Dictionary<LLUUID, string> capsURLS = new Dictionary<LLUUID, string>();
#region Vector Equasions // Get a list of invalid path characters (OS dependent)
private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]";
// Get a list of invalid file characters (OS dependent)
private static string regexInvalidFileChars = "[" + new String(Path.GetInvalidFileNameChars()) + "]";
#region Vector Equasions
/// <summary> /// <summary>
/// Get the distance between two 3d vectors /// Get the distance between two 3d vectors
/// </summary> /// </summary>
@ -60,7 +66,7 @@ namespace OpenSim.Framework
float dx = a.X - b.X; float dx = a.X - b.X;
float dy = a.Y - b.Y; float dy = a.Y - b.Y;
float dz = a.Z - b.Z; float dz = a.Z - b.Z;
return Math.Sqrt(dx*dx + dy*dy + dz*dz); return Math.Sqrt(dx * dx + dy * dy + dz * dz);
} }
/// <summary> /// <summary>
@ -68,7 +74,8 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
/// <param name="a">A 3d vector</param> /// <param name="a">A 3d vector</param>
/// <returns>The magnitude of the vector</returns> /// <returns>The magnitude of the vector</returns>
public static double GetMagnitude(LLVector3 a) { public static double GetMagnitude(LLVector3 a)
{
return Math.Sqrt((a.X * a.X) + (a.Y * a.Y) + (a.Z * a.Z)); return Math.Sqrt((a.X * a.X) + (a.Y * a.Y) + (a.Z * a.Z));
} }
@ -91,16 +98,16 @@ namespace OpenSim.Framework
/// Returns if a vector is a zero vector (has all zero components) /// Returns if a vector is a zero vector (has all zero components)
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public static bool IsZeroVector( LLVector3 v ) public static bool IsZeroVector(LLVector3 v)
{ {
if( v.X == 0 && v.Y == 0 && v.Z == 0) if (v.X == 0 && v.Y == 0 && v.Z == 0)
{ {
return true; return true;
} }
return false; return false;
} }
# endregion # endregion
public static ulong UIntsToLong(uint X, uint Y) public static ulong UIntsToLong(uint X, uint Y)
{ {
@ -299,7 +306,7 @@ namespace OpenSim.Framework
for (int j = 0; j < 16 && (i + j) < bytes.Length; j++) for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
{ {
if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E) if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
output.Append((char) bytes[i + j]); output.Append((char)bytes[i + j]);
else else
output.Append("."); output.Append(".");
} }
@ -358,6 +365,28 @@ namespace OpenSim.Framework
return null; return null;
} }
/// <summary>
/// Removes all invalid path chars (OS dependent)
/// </summary>
/// <param name="path">path</param>
/// <returns>safe path</returns>
public static string safePath(string path)
{
return System.Text.RegularExpressions.Regex.Replace(path, @regexInvalidPathChars, string.Empty);
}
/// <summary>
/// Removes all invalid filename chars (OS dependent)
/// </summary>
/// <param name="path">filename</param>
/// <returns>safe filename</returns>
public static string safeFileName(string filename)
{
return System.Text.RegularExpressions.Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ;
}
// //
// directory locations // directory locations
// //
@ -365,12 +394,12 @@ namespace OpenSim.Framework
public static string homeDir() public static string homeDir()
{ {
string temp; string temp;
// string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal)); // string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal));
// temp = Path.Combine(personal,".OpenSim"); // temp = Path.Combine(personal,".OpenSim");
temp = "."; temp = ".";
return temp; return temp;
} }
public static string assetsDir() public static string assetsDir()
{ {
return Path.Combine(configDir(), "assets"); return Path.Combine(configDir(), "assets");
@ -439,10 +468,10 @@ namespace OpenSim.Framework
public static void AddDataRowToConfig(IConfigSource config, DataRow row) public static void AddDataRowToConfig(IConfigSource config, DataRow row)
{ {
config.Configs.Add((string) row[0]); config.Configs.Add((string)row[0]);
for (int i = 0; i < row.Table.Columns.Count; i++) for (int i = 0; i < row.Table.Columns.Count; i++)
{ {
config.Configs[(string) row[0]].Set(row.Table.Columns[i].ColumnName, row[i]); config.Configs[(string)row[0]].Set(row.Table.Columns[i].ColumnName, row[i]);
} }
} }
@ -468,25 +497,25 @@ namespace OpenSim.Framework
public static string CleanString(string input) public static string CleanString(string input)
{ {
if(input.Length == 0) if (input.Length == 0)
return input; return input;
int clip=input.Length; int clip = input.Length;
// Test for ++ string terminator // Test for ++ string terminator
int pos=input.IndexOf("\0"); int pos = input.IndexOf("\0");
if(pos != -1 && pos < clip) if (pos != -1 && pos < clip)
clip=pos; clip = pos;
// Test for CR // Test for CR
pos=input.IndexOf("\r"); pos = input.IndexOf("\r");
if(pos != -1 && pos < clip) if (pos != -1 && pos < clip)
clip=pos; clip = pos;
// Test for LF // Test for LF
pos=input.IndexOf("\n"); pos = input.IndexOf("\n");
if(pos != -1 && pos < clip) if (pos != -1 && pos < clip)
clip=pos; clip = pos;
// Truncate string before first end-of-line character found // Truncate string before first end-of-line character found
return input.Substring(0, clip); return input.Substring(0, clip);