a bit better detection for own/nextcloud, still not working for some older nextcloud versions
Hanno Böck commited on 2017-02-08 00:01:21
Zeige 2 geänderte Dateien mit 7 Einfügungen und 2 Löschungen.
- freewvs 4298261..618dcfa
- freewvsdb/misc.freewvs 476c146..c4dcf9d
| ... | ... |
@@ -139,6 +139,10 @@ for sect in config.sections(): |
| 139 | 139 |
item['extra_match'] = config.get(sect, 'extra_match') |
| 140 | 140 |
else: |
| 141 | 141 |
item['extra_match'] = False |
| 142 |
+ if config.has_option(sect, 'extra_nomatch'): |
|
| 143 |
+ item['extra_nomatch'] = config.get(sect, 'extra_nomatch') |
|
| 144 |
+ else: |
|
| 145 |
+ item['extra_nomatch'] = False |
|
| 142 | 146 |
if config.has_option(sect, 'add_minor'): |
| 143 | 147 |
item['add_minor'] = config.get(sect, 'add_minor') |
| 144 | 148 |
else: |
| ... | ... |
@@ -173,6 +177,8 @@ for fdir in args: |
| 173 | 177 |
|
| 174 | 178 |
if item['extra_match']: |
| 175 | 179 |
ematch = (filestr.find(item['extra_match']) != -1) |
| 180 |
+ elif item['extra_nomatch']: |
|
| 181 |
+ ematch = not (filestr.find(item['extra_nomatch']) != -1) |
|
| 176 | 182 |
else: |
| 177 | 183 |
ematch = True |
| 178 | 184 |
|
| ... | ... |
@@ -343,13 +343,12 @@ variable=$OC_VersionString |
| 343 | 343 |
vuln=https://owncloud.org/security/advisory/?id=oc-sa-2017-003 |
| 344 | 344 |
safe=9.1.3 |
| 345 | 345 |
subdir=0 |
| 346 |
-extra_match=$OC_Edition = ''; |
|
| 346 |
+extra_nomatch=nextcloud |
|
| 347 | 347 |
|
| 348 | 348 |
[owncloud5] |
| 349 | 349 |
url=http://owncloud.org/ |
| 350 | 350 |
file=util.php |
| 351 | 351 |
variable=return ' |
| 352 |
-extra_match=OC_Util |
|
| 353 | 352 |
subdir=1 |
| 354 | 353 |
vuln=https://owncloud.org/security/advisory/?id=oc-sa-2017-003 |
| 355 | 354 |
safe=9.1.3 |
| 356 | 355 |