Module: check_mk
Branch: master
Commit: 8075a7c2f33d9b9c5b6f96826fcdf6e399175b5a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8075a7c2f33d9b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue May 30 07:52:12 2017 +0200
4750 FIX Ensure uploaded icons are saved with their filename instead of paths
Uploaded icons may be saved with their full origin path as file name
(the location the file is stored on the client) with some browsers. This
could end up in paths like this:
C:\Users\Username\Documents\Icons\service.png will be stored in Check_MK like
~/local/share/check_mk/web/htdocs/images/icon/C:\\Users\\Username\\Documents\\Icons\\service.png
These files could not be used by the user after upload. These files are now
saved with their filename as expected.
Change-Id: If5c3d156056ef9eb2f4809f162a9bba4b1fdab34
---
.werks/4750 | 19 +++++++++++++++++++
web/htdocs/wato.py | 3 ++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/.werks/4750 b/.werks/4750
new file mode 100644
index 0000000..d6a1de7
--- /dev/null
+++ b/.werks/4750
@@ -0,0 +1,19 @@
+Title: Ensure uploaded icons are saved with their filename instead of paths
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1496123348
+
+Uploaded icons may be saved with their full origin path as file name
+(the location the file is stored on the client) with some browsers. This
+could end up in paths like this:
+
+C:\Users\Username\Documents\Icons\service.png will be stored in Check_MK like
+~/local/share/check_mk/web/htdocs/images/icon/C:\\Users\\Username\\Documents\\Icons\\service.png
+
+These files could not be used by the user after upload. These files are now
+saved with their filename as expected.
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 71b61b6..c23bb2b 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -15549,7 +15549,8 @@ def upload_icon(icon_info):
dest_dir = "%s/local/share/check_mk/web/htdocs/images/icons" % cmk.paths.omd_root
make_nagios_directories(dest_dir)
try:
- im.save(dest_dir+'/'+icon_info['icon'][0], 'PNG', pnginfo=meta)
+ file_name = os.path.basename(icon_info['icon'][0])
+ im.save(dest_dir+'/'+file_name, 'PNG', pnginfo=meta)
except IOError, e:
# Might happen with interlaced PNG files and PIL version < 1.1.7
raise MKUserError(None, _('Unable to upload icon: %s') % e)
Module: check_mk
Branch: master
Commit: 28bb84e8e9977f9825b110a25810b089076e4a31
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28bb84e8e9977f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue May 30 08:00:33 2017 +0200
Updated bug entries #2501
Change-Id: Ia9b10d0e2f4c4a6b82d809051e47ccc53261e152
---
.bugs/2501 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/2501 b/.bugs/2501
index 9fcf97d..31d197b 100644
--- a/.bugs/2501
+++ b/.bugs/2501
@@ -1,9 +1,12 @@
Title: Link from Check_MK-Logo in page titles goes to German home page
Component: multisite
-State: open
+Class: nastiness
+State: done
Date: 2016-09-27 18:32:21
Targetversion: 1.2.8
-Class: nastiness
The link should point to mathias-kettner.com for English users and
mathias-kettner.de for German users.
+
+2017-05-30 07:58:59: changed state open -> done
+fixed
Module: check_mk
Branch: master
Commit: 8652d9a1e34fc5ed43a8141d86dbbd2e2232992c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8652d9a1e34fc5…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue May 30 07:58:25 2017 +0200
Updated bug entries #2921, #2252, #2415, #2740, #1014, #0924, #2782
Change-Id: Ibddda4c6850e1fabcc043e46078c072ab25a751d
---
.bugs/1014 | 7 +++++--
.bugs/2252 | 7 +++++--
.bugs/2415 | 7 +++++--
.bugs/2740 | 7 +++++--
.bugs/2782 | 7 +++++--
.bugs/2921 | 7 +++++--
.bugs/924 | 7 +++++--
7 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/.bugs/1014 b/.bugs/1014
index e080d40..7636a89 100644
--- a/.bugs/1014
+++ b/.bugs/1014
@@ -1,9 +1,12 @@
Title: some global settings show a help text when hovering over them, some dont
Component: wato
-State: open
+Class: nastiness
+State: done
Date: 2014-11-06 17:28:13
Targetversion: future
-Class: nastiness
most of the global settings show a help text when clicking on the settings line, however only some of these
also show the help text when hovering over the line. hovering should work for all the global settings.
+
+2017-05-30 07:54:52: changed state open -> done
+Fixed afaik.
diff --git a/.bugs/2252 b/.bugs/2252
index c4bb324..babe3b1 100644
--- a/.bugs/2252
+++ b/.bugs/2252
@@ -1,9 +1,9 @@
Title: HTTP check output is parsed incorrectly
Component: multisite
-State: open
+Class: nastiness
+State: done
Date: 2014-11-21 15:08:21
Targetversion: future
-Class: nastiness
The URL parser appears to have problems with single quotes.
Excerpt from HTML-code generated by multisite:
@@ -18,3 +18,6 @@ bytes in 0.091 second response time</td><td class="age">45 hrs</td>
<td class="age">1 sec</td>
Note the single quote after mail.mwh.de/
+
+2017-05-30 07:58:22: changed state open -> done
+Fixed long time ago.
diff --git a/.bugs/2415 b/.bugs/2415
index 3d86cf7..3aa181f 100644
--- a/.bugs/2415
+++ b/.bugs/2415
@@ -1,9 +1,12 @@
Title: Remove bogus ancient examples from multisite.mk
Component: multisite
-State: open
+Class: nastiness
+State: done
Date: 2015-12-08 10:12:30
Targetversion: future
-Class: nastiness
The comments and suggested settings are not uptodate anymore. Also maybe
remove the custom links contents.
+
+2017-05-30 07:56:45: changed state open -> done
+done.
diff --git a/.bugs/2740 b/.bugs/2740
index 1bcfbde..a36863e 100644
--- a/.bugs/2740
+++ b/.bugs/2740
@@ -1,7 +1,10 @@
Title: create-rrd-helper should log to to core (cmc.log) like other helpers
Component: core
-State: open
+Class: nastiness
+State: done
Date: 2014-12-12 11:33:35
Targetversion: next
-Class: nastiness
+
+2017-05-30 07:55:40: changed state open -> done
+does not exist anymore.
diff --git a/.bugs/2782 b/.bugs/2782
index b756f29..dd4b281 100644
--- a/.bugs/2782
+++ b/.bugs/2782
@@ -1,9 +1,12 @@
Title: snapshot.secret should not be binary
Component: core
-State: open
+Class: nastiness
+State: done
Date: 2015-03-31 10:23:09
Targetversion: master
-Class: nastiness
The file snapshot.secret that is being created in etc/check_mk should not
be binary but printable to the terminal. Use some encoding.
+
+2017-05-30 07:55:13: changed state open -> done
+Snapshots have been removed.
diff --git a/.bugs/2921 b/.bugs/2921
index 1c237df..6804918 100644
--- a/.bugs/2921
+++ b/.bugs/2921
@@ -1,9 +1,9 @@
Title: Icon upload saves icon with full path
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2017-05-26 16:20:45
Targetversion: 1.2.8
-Class: bug
If a customers uploads its own icons in 1.2.8p18, all icons will be save with the local upload path as
file name.
@@ -13,3 +13,6 @@ C:\Users\Username\Documents\Icons\service.png will be stored in Check_MK like
~/local/share/check_mk/web/htdocs/images/icon/C:\\Users\\Username\\Documents\\Icons\\service.png
Those icons are not shown to the customer.
+
+2017-05-30 07:52:32: changed state open -> done
+Has just been fixed.
diff --git a/.bugs/924 b/.bugs/924
index d093039..4e07fae 100644
--- a/.bugs/924
+++ b/.bugs/924
@@ -1,12 +1,15 @@
Title: The WATO progress bar in activate changes is sync and might timeout
Component: wato
-State: open
+Class: nastiness
+State: done
Date: 2013-06-20 13:58:40
Targetversion: 1.2.3
-Class: nastiness
The progress bar is updated by a ajax request which waits for the configuration to be activated.
This is a problem in setups where activating takes more than the timeouts of the system/site apache.
In that case the progres bar fills up to 100% width but never changes the state to "finished". It
stays on "activating...". The ajax request is terminated with 502 http code. This seems not to
be handled correctly in the dialog.
+
+2017-05-30 07:53:53: changed state open -> done
+Has been fixed with new activate changes.