Skip to content
Permalink
Browse files Browse the repository at this point in the history
Version 1.7.7
behebt Denial of Service Bug durch Fehler in URL-scanning Regex
  • Loading branch information
luelistan committed Aug 13, 2015
1 parent aea4a1b commit c06c2e5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Setups/codesign-and-make-setup.bat
Expand Up @@ -44,7 +44,7 @@ CALL codesign-dragdrop.bat %INSTALLER%

echo.
echo Step 4 - Uploading as minefield...
"C:\Program Files (x86)\Git\bin\scp.exe" %INSTALLER% maxweller@cherry.luelistan.net:/srv/hosts/max-weller.de/downloads.max-weller.de/miniconf/miniconf-minefield-setup.exe
"C:\Program Files (x86)\Git\bin\scp.exe" %INSTALLER% maxweller@oak.teamwiki.net:/var/www/hosts/downloads.max-weller.de/miniconf/miniconf-minefield-setup.exe



Expand Down
Binary file added Setups/miniconf-1.7.7.exe
Binary file not shown.
2 changes: 2 additions & 0 deletions miniConf/Form1.cs
Expand Up @@ -412,11 +412,13 @@ public partial class Form1 : Form {
}
if (enableNotificationsToolStripMenuItem.Checked && !String.IsNullOrEmpty(messageBody)) {
if (ApplicationPreferences.WineTricks) {
Console.WriteLine("Displaying notification via notify-send ...");
ProcessStartInfo psi = new ProcessStartInfo();
psi.FileName = "/usr/bin/notify-send";
psi.Arguments = "\"Nachricht von " + msg.From.ToString() + "\" \"" + messageBody + "\"";
Process.Start(psi);
} else {
Console.WriteLine("Showing balloon tip: " + msg.From.Resource + " in " + msg.From.User);
balloonRoom = msg.From.Bare;
notifyIcon1.ShowBalloonTip(30000, msg.From.Resource + " in " + msg.From.User + ":", messageBody, ToolTipIcon.Info);
}
Expand Down
2 changes: 1 addition & 1 deletion miniConf/MessageView.cs
Expand Up @@ -170,7 +170,7 @@ class MessageView : WebBrowser {
if (!String.IsNullOrEmpty(highlightString)) text = Regex.Replace(text, highlightString, "<em>$0</em>");
text = text.Replace("\n", "\n<br>");
var imageLink = Regex.Match(text, "https?://[\\w.-]+/[\\w_.,/+?&%$!=)(\\[\\]{}-]*\\.(png|jpg|gif|webp)");
text = Regex.Replace(text, "(?i)\\b((?:[a-z][\\w-]+:(?:/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))",
text = Regex.Replace(text, "(?i)\\b((?:[a-z][\\w-]+:(?:/{1,3})|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))",
(match) => ("<a href=\"" + match.Value.Replace("\"", "&quot;") + "\">" + match.Value + "</a>"));
if (imagePreview && imageLink.Success) {
string link = imageLink.Value;
Expand Down
4 changes: 2 additions & 2 deletions miniConf/Properties/AssemblyInfo.cs
Expand Up @@ -32,5 +32,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.6.4")]
[assembly: AssemblyFileVersion("1.7.6.4")]
[assembly: AssemblyVersion("1.7.7.0")]
[assembly: AssemblyFileVersion("1.7.7.0")]

0 comments on commit c06c2e5

Please sign in to comment.