Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge changes from trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | sec2020 |
| Files: | files | file ages | folders |
| SHA3-256: |
4a8bc878f03b3bfef427800ff4a92f2d |
| User & Date: | drh 2020-08-24 00:24:00.564 |
Context
|
2020-08-24
| ||
| 23:24 | Merge miscellanous auxiliary defenses and security enhancements. This check-in is not needed to fix any problems that are not already fixed in version 2.12.1. It merely provides additional defense in depth. check-in: f741baa6be user: drh tags: trunk | |
| 00:24 | Merge changes from trunk. Closed-Leaf check-in: 4a8bc878f0 user: drh tags: sec2020 | |
|
2020-08-23
| ||
| 22:11 | Provide backlinks from Forum posts. Run rebuild to insert Forum backlinks into the BACKLINK table after applying this patch. check-in: 2df0e5c428 user: drh tags: trunk | |
| 16:02 | Merge the interwiki enhancement from trunk. check-in: 26ac4b1ccf user: drh tags: sec2020 | |
Changes
Changes to src/backlink.c.
| ︙ | ︙ | |||
167 168 169 170 171 172 173 |
Manifest *pWiki;
if( tagid==0 ) return;
rid = db_int(0, "SELECT rid FROM tagxref WHERE tagid=%d"
" ORDER BY mtime DESC LIMIT 1", tagid);
if( rid==0 ) return;
pWiki = manifest_get(rid, CFTYPE_WIKI, 0);
if( pWiki ){
| | > | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
Manifest *pWiki;
if( tagid==0 ) return;
rid = db_int(0, "SELECT rid FROM tagxref WHERE tagid=%d"
" ORDER BY mtime DESC LIMIT 1", tagid);
if( rid==0 ) return;
pWiki = manifest_get(rid, CFTYPE_WIKI, 0);
if( pWiki ){
backlink_extract(pWiki->zWiki, pWiki->zMimetype, tagid, BKLNK_WIKI,
pWiki->rDate, 1);
manifest_destroy(pWiki);
}
}
/*
** Structure used to pass down state information through the
** markup formatters into the BACKLINK generator.
|
| ︙ | ︙ |
Changes to src/configure.c.
| ︙ | ︙ | |||
730 731 732 733 734 735 736 | ** accept the -R or --repository option to specify a repository. ** ** > fossil configuration export AREA FILENAME ** ** Write to FILENAME exported configuration information for AREA. ** AREA can be one of: ** | > | | 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 | ** accept the -R or --repository option to specify a repository. ** ** > fossil configuration export AREA FILENAME ** ** Write to FILENAME exported configuration information for AREA. ** AREA can be one of: ** ** all email interwiki project shun skin ** ticket user alias subscriber ** ** > fossil configuration import FILENAME ** ** Read a configuration from FILENAME, overwriting the current ** configuration. ** ** > fossil configuration merge FILENAME |
| ︙ | ︙ |
Changes to src/manifest.c.
| ︙ | ︙ | |||
2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 |
db_multi_exec(
"REPLACE INTO event(type,mtime,objid,user,comment)"
"VALUES('f',%.17g,%d,%Q,'%q: %q')",
p->rDate, rid, p->zUser, zFType, zTitle
);
fossil_free(zTitle);
}
}
db_end_transaction(0);
if( permitHooks ){
rc = xfer_run_common_script();
if( rc==TH_OK ){
rc = xfer_run_script(zScript, zUuid, 0);
}
| > > > | 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 |
db_multi_exec(
"REPLACE INTO event(type,mtime,objid,user,comment)"
"VALUES('f',%.17g,%d,%Q,'%q: %q')",
p->rDate, rid, p->zUser, zFType, zTitle
);
fossil_free(zTitle);
}
if( p->zWiki[0] ){
backlink_extract(p->zWiki, p->zMimetype, rid, BKLNK_FORUM, p->rDate, 1);
}
}
db_end_transaction(0);
if( permitHooks ){
rc = xfer_run_common_script();
if( rc==TH_OK ){
rc = xfer_run_script(zScript, zUuid, 0);
}
|
| ︙ | ︙ |
Changes to src/wiki.c.
| ︙ | ︙ | |||
1002 1003 1004 1005 1006 1007 1008 |
*/
static void wiki_render_page_list_json(int verbose, int includeContent){
Stmt q = empty_Stmt;
int n = 0;
db_begin_transaction();
db_prepare(&q, "SELECT"
" substr(tagname,6) AS name"
| > | | 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 |
*/
static void wiki_render_page_list_json(int verbose, int includeContent){
Stmt q = empty_Stmt;
int n = 0;
db_begin_transaction();
db_prepare(&q, "SELECT"
" substr(tagname,6) AS name"
" FROM tag JOIN tagxref USING('tagid')"
" WHERE tagname GLOB 'wiki-*'"
" UNION SELECT 'Sandbox' AS name"
" ORDER BY name COLLATE NOCASE");
CX("[");
while( SQLITE_ROW==db_step(&q) ){
char const * zName = db_column_text(&q,0);
if(verbose==0){
if(n++){
|
| ︙ | ︙ |
Changes to www/changes.wiki.
1 2 3 4 5 6 7 8 9 10 11 12 13 |
<title>Change Log</title>
<a name='v2_13'></a>
<h2>Changes for Version 2.13 (pending)</h2>
* Added support for [./interwiki.md|interwiki links].
<a name='v2_12'></a>
<h2>Changes for Version 2.12.1 (2020-08-20)</h2>
* (2.12.1): Fix client-side vulnerabilities discovered by Max Justicz.
* Security fix in the "[/help?cmd=git|fossil git export]" command.
The same fix is also backported to version 2.10.1 and 2.11.1.
| > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
<title>Change Log</title>
<a name='v2_13'></a>
<h2>Changes for Version 2.13 (pending)</h2>
* Added support for [./interwiki.md|interwiki links].
* Enable <del> and <ins> markup in wiki.
* Improvements to the Forum threading display.
<a name='v2_12'></a>
<h2>Changes for Version 2.12.1 (2020-08-20)</h2>
* (2.12.1): Fix client-side vulnerabilities discovered by Max Justicz.
* Security fix in the "[/help?cmd=git|fossil git export]" command.
The same fix is also backported to version 2.10.1 and 2.11.1.
|
| ︙ | ︙ |