Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

v2.11.1.1

Browse Source
This commit is contained in:
gnosygnu
2015-11-01 20:50:05 -05:00
parent 4f43f51b18
commit b990ec409f
858 changed files with 6758 additions and 4187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
400_xowa/src/gplx/xowa/htmls/js/Xoh_js_cbk.java
View File

@@ -29,10 +29,10 @@ public class Xoh_js_cbk implements GfoInvkAble {
public Xoh_js_cbk(Xog_html_itm html_itm) {this.html_itm = html_itm; this.app = html_itm.Owner_tab().Tab_mgr().Win().App();}
private String Xowa_exec_test(GfoMsg m) { // concat args with pipe; EX: xowa_exec('proc', 'arg0', 'arg1'); -> proc|arg0|arg1
bfr.Clear();
bfr.Add_str(m.Key());
bfr.Add_str_u8(m.Key());
int len = m.Args_count();
for (int i = 0; i < len; i++)
bfr.Add_str_a7("|").Add_str(m.Args_getAt(i).Val_to_str_or_empty());
bfr.Add_str_a7("|").Add_str_u8(m.Args_getAt(i).Val_to_str_or_empty());
return bfr.To_str_and_clear();
}
private String[] Xowa_exec_test_as_array(GfoMsg m) {// return args as array; EX: xowa_exec('proc', 'arg0', 'arg1'); -> proc,arg0,arg1

203
400_xowa/src/gplx/xowa/htmls/js/Xoh_js_cleaner.java Normal file
View File

@@ -0,0 +1,203 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012 gnosygnu@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.htmls.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
import gplx.core.btries.*;
public class Xoh_js_cleaner {
private Xoae_app app; private boolean ctor = true;
public Xoh_js_cleaner(Xoae_app app) {this.app = app;}
public void Clean_bfr(Xowe_wiki wiki, Xoa_ttl ttl, Bry_bfr bfr, int bgn) {
int end = bfr.Len();
byte[] cleaned = this.Clean(wiki, bfr.Bfr(), bgn, end);
if (cleaned != null) {
bfr.Del_by(end - bgn);
bfr.Add(cleaned);
app.Usr_dlg().Warn_many("", "", "javascript detected: wiki=~{0} ~{1}", wiki.Domain_str(), String_.new_u8(ttl.Full_txt()));
}
}
public byte[] Clean(Xowe_wiki wiki, byte[] src, int bgn, int end) {
if (ctor) Ctor();
Bry_bfr bfr = null;
boolean dirty = false;
try {
bfr = wiki.Utl__bfr_mkr().Get_m001();
int pos = bgn;
while (pos < end) {
byte b = src[pos];
Object o = trie.Match_bgn_w_byte(b, src, pos, end);
if (o == null) {
if (dirty)
bfr.Add_byte(b);
++pos;
}
else {
byte[] frag = (byte[])o;
int frag_len = frag.length;
if (frag[0] == Byte_ascii.Lt) { // jscript node; EX: <script
if (!dirty) {bfr.Add_mid(src, bgn, pos); dirty = true;}
bfr.Add(gplx.langs.htmls.Html_entity_.Lt_bry);
bfr.Add_mid(frag, 1, frag.length);
pos += frag_len;
}
else { // jscript attribue; EX: onmouseover
int atr_pos = Get_pos_eq(src, pos, end, frag_len);
if (atr_pos == -1) // false match; EX: "onSelectNotJs=3"; "regionSelect=2"
pos += frag_len;
else {
if (!dirty) {bfr.Add_mid(src, bgn, pos); dirty = true;}
bfr.Add(frag);
bfr.Add(gplx.langs.htmls.Html_entity_.Eq_bry);
pos = atr_pos;
}
}
}
}
} finally {if (bfr != null) bfr.Mkr_rls();}
return dirty ? bfr.To_bry_and_clear() : null;
}
private int Get_pos_eq(byte[] src, int pos, int end, int frag_len) {
if ( pos > 0 // bounds check
&& !Byte_ascii.Is_ws(src[pos - 1]) // previous byte is not whitespace; frag is part of word; EX: "regionSelect=2"; DATE:2014-02-06
)
return -1;
boolean next_byte_is_equal = false; boolean break_loop = false;
int atr_pos = pos + frag_len;
for (; atr_pos < end; atr_pos++) {
byte atr_b = src[atr_pos];
switch (atr_b) {
case Byte_ascii.Tab: case Byte_ascii.Nl: case Byte_ascii.Cr: case Byte_ascii.Space: break;
case Byte_ascii.Eq:
next_byte_is_equal = true;
++atr_pos;
break_loop = true;
break;
default:
break_loop = true;
break;
}
if (break_loop) break;
}
return next_byte_is_equal ? atr_pos : -1;
}
private void Ctor() {
Reg_itm("<script");
Reg_itm("<iframe");
Reg_itm("<style");
Reg_itm("<link");
Reg_itm("<meta");
Reg_itm("<Object");
Reg_itm("<frame");
Reg_itm("<embed");
Reg_itm("<body");
Reg_itm("FSCommand");
Reg_itm("onAbort");
Reg_itm("onActivate");
Reg_itm("onAfterPrint");
Reg_itm("onAfterUpdate");
Reg_itm("onBeforeActivate");
Reg_itm("onBeforeCopy");
Reg_itm("onBeforeCut");
Reg_itm("onBeforeDeactivate");
Reg_itm("onBeforeEditFocus");
Reg_itm("onBeforePaste");
Reg_itm("onBeforePrint");
Reg_itm("onBeforeUnload");
Reg_itm("onBegin");
Reg_itm("onBlur");
Reg_itm("onBounce");
Reg_itm("onCellChange");
Reg_itm("onChange");
Reg_itm("onClick");
Reg_itm("onContextMenu");
Reg_itm("onControlSelect");
Reg_itm("onCopy");
Reg_itm("onCut");
Reg_itm("onDataAvailable");
Reg_itm("onDataSetChanged");
Reg_itm("onDataSetComplete");
Reg_itm("onDblClick");
Reg_itm("onDeactivate");
Reg_itm("onDrag");
Reg_itm("onDragEnd");
Reg_itm("onDragLeave");
Reg_itm("onDragEnter");
Reg_itm("onDragOver");
Reg_itm("onDragDrop");
Reg_itm("onDrop");
Reg_itm("onEnd");
Reg_itm("onError");
Reg_itm("onErrorUpdate");
Reg_itm("onFilterChange");
Reg_itm("onFinish");
Reg_itm("onFocus");
Reg_itm("onFocusIn");
Reg_itm("onFocusOut");
Reg_itm("onHelp");
Reg_itm("onKeyDown");
Reg_itm("onKeyPress");
Reg_itm("onKeyUp");
Reg_itm("onLayoutComplete");
Reg_itm("onLoad");
Reg_itm("onLoseCapture");
Reg_itm("onMediaComplete");
Reg_itm("onMediaError");
Reg_itm("onMouseDown");
Reg_itm("onMouseEnter");
Reg_itm("onMouseLeave");
Reg_itm("onMouseMove");
Reg_itm("onMouseOut");
Reg_itm("onMouseOver");
Reg_itm("onMouseUp");
Reg_itm("onMouseWheel");
Reg_itm("onMove");
Reg_itm("onMoveEnd");
Reg_itm("onMoveStart");
Reg_itm("onOutOfSync");
Reg_itm("onPaste");
Reg_itm("onPause");
Reg_itm("onProgress");
Reg_itm("onPropertyChange");
Reg_itm("onReadyStateChange");
Reg_itm("onRepeat");
Reg_itm("onReset");
Reg_itm("onResize");
Reg_itm("onResizeEnd");
Reg_itm("onResizeStart");
Reg_itm("onResume");
Reg_itm("onReverse");
Reg_itm("onRowsEnter");
Reg_itm("onRowExit");
Reg_itm("onRowDelete");
Reg_itm("onRowInserted");
Reg_itm("onScroll");
Reg_itm("onSeek");
Reg_itm("onSelect");
Reg_itm("onSelectionChange");
Reg_itm("onSelectStart");
Reg_itm("onStart");
Reg_itm("onStop");
Reg_itm("onSyncRestored");
Reg_itm("onSubmit");
Reg_itm("onTimeError");
Reg_itm("onTrackChange");
Reg_itm("onUnload");
Reg_itm("onURLFlip");
Reg_itm("seekSegmentTime");
ctor = false;
}
private void Reg_itm(String s) {trie.Add_bry(Bry_.new_a7(s));} Btrie_slim_mgr trie = Btrie_slim_mgr.ci_a7(); // NOTE:ci.ascii:javascript event name
}

42
400_xowa/src/gplx/xowa/htmls/js/Xoh_js_cleaner_tst.java Normal file
View File

@@ -0,0 +1,42 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012 gnosygnu@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.htmls.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*;
import org.junit.*;
public class Xoh_js_cleaner_tst {
@Before public void init() {fxt.Init();} private Xoh_js_cleaner_fxt fxt = new Xoh_js_cleaner_fxt();
@Test public void Basic() {fxt.Test_clean("<i>a</i>", "<i>a</i>");}
@Test public void Js_nde() {fxt.Test_clean("a<script>b</script>c", "a&lt;script>b</script>c");}
@Test public void Js_atr() {fxt.Test_clean("a<span onmouseover = 'fail'>b</span>c", "a<span onMouseOver&#61; 'fail'>b</span>c");}
@Test public void Js_atr_noop() {fxt.Test_clean("a onmouseover b", "a onmouseover b");}
@Test public void Js_atr_noop_regionSelect() {fxt.Test_clean("regionSelect=2", "regionSelect=2");}
}
class Xoh_js_cleaner_fxt {
public void Init() {
if (mgr == null) {
app = Xoa_app_fxt.app_();
wiki = Xoa_app_fxt.wiki_tst_(app);
mgr = app.Html_mgr().Js_cleaner();
}
} private Xoae_app app; Xowe_wiki wiki; Xoh_js_cleaner mgr;
public void Test_clean(String raw_str, String expd) {
byte[] raw = Bry_.new_a7(raw_str);
byte[] actl = mgr.Clean(wiki, raw, 0, raw.length);
if (actl == null) actl = raw;
Tfds.Eq(expd, String_.new_a7(actl));
}
}