a53b9958fa734f73aeffb9ddfe2fbad1ca65f90c galt Mon Jan 30 16:18:41 2017 -0800 Check-in of CSP2 Content-Security-Policy work. All C-language CGIs should now support CSP2 in browser to stop major forms of XSS javascript injection. Javascript on pages is gathered together, and then emitted in a single script block at the end with a nonce that tells the browser, this is js that we generated instead of being injected by a hacker. Both inline script from script blocks and inline js event handlers had to be pulled out and separated. You will not see js sprinkled through-out the page now. Older browsers that support CSP1 or that do not understand CSP at all will still work, just without protection. External js libraries loaded at runtime need to be added to the CSP policy header in src/lib/htmshell.c. diff --git src/hg/lib/gtexUi.c src/hg/lib/gtexUi.c index 6dc5b62..35ef303 100644 --- src/hg/lib/gtexUi.c +++ src/hg/lib/gtexUi.c @@ -340,32 +340,33 @@ char cartVar[1024]; puts("<b>Show GTEx gene model:</b>\n"); safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_SHOW_EXONS); boolean showExons = cartCgiUsualBoolean(cart, cartVar, GTEX_SHOW_EXONS_DEFAULT); cgiMakeCheckBox(cartVar, showExons); } void gtexGeneUiLogTransform(struct cart *cart, char *track, struct trackDb *tdb) /* Checkbox to select log-transformed RPKM values */ { char cartVar[1024]; char buf[512]; puts("<b>Log10 transform:</b>\n"); safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_LOG_TRANSFORM); boolean isLogTransform = cartCgiUsualBoolean(cart, cartVar, GTEX_LOG_TRANSFORM_DEFAULT); -safef(buf, sizeof buf, "onchange='gtexTransformChanged(\"%s\")'", track); -cgiMakeCheckBoxJS(cartVar, isLogTransform, buf); +safef(buf, sizeof buf, "gtexTransformChanged('%s');", track); +cgiMakeCheckBoxWithId(cartVar, isLogTransform, cartVar); +jsOnEventById("change", cartVar, buf); } void gtexGeneUiViewLimits(struct cart *cart, char *track, struct trackDb *tdb) /* Set viewing limits if log transform not checked */ { char cartVar[1024]; char buf[512]; boolean isLogTransform = cartCgiUsualBoolean(cart, cartVar, GTEX_LOG_TRANSFORM_DEFAULT); safef(buf, sizeof buf, "%sViewLimitsMaxLabel %s", track, isLogTransform ? "disabled" : ""); printf("<span class='%s'><b>View limits maximum:</b></span>\n", buf); safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_MAX_LIMIT); int viewMax = cartCgiUsualInt(cart, cartVar, GTEX_MAX_LIMIT_DEFAULT); cgiMakeIntVarWithExtra(cartVar, viewMax, 4, isLogTransform ? "disabled" : ""); char *version = gtexVersion(tdb->table); printf("<span class='%s'> RPKM (range 0-%d)</span>\n", buf, round(gtexMaxMedianScore(version))); @@ -402,35 +403,35 @@ puts("<div>"); gtexGeneUiLogTransform(cart, track, tdb); /* Viewing limits max. This control is disabled if log transform is selected */ // construct class so JS can toggle puts(" "); gtexGeneUiViewLimits(cart, track, tdb); puts("</div>"); #ifdef COMPARISON /* Sample selection */ printf("<div><b>Samples:</b> "); safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_SAMPLES); char *selected = cartCgiUsualString(cart, cartVar, GTEX_SAMPLES_DEFAULT); boolean isAllSamples = sameString(selected, GTEX_SAMPLES_ALL); -safef(buf, sizeof buf, "onchange='gtexSamplesChanged(\"%s\")'", track); +safef(buf, sizeof buf, "gtexSamplesChanged(\"%s\");", track); char *command = buf; -cgiMakeOnClickRadioButton(cartVar, GTEX_SAMPLES_ALL, isAllSamples, command); +cgiMakeOnEventRadioButtonWithClass(cartVar, GTEX_SAMPLES_ALL, isAllSamples, NULL, "change", command); printf("All\n"); -cgiMakeOnClickRadioButton(cartVar, GTEX_SAMPLES_COMPARE_SEX, !isAllSamples, command); +cgiMakeOnEventRadioButtonWithClass(cartVar, GTEX_SAMPLES_COMPARE_SEX, !isAllSamples, NULL, "change", command); printf("Compare by gender\n"); printf("</div>"); /* Comparison type. Disabled if All samples selected. */ safef(buf, sizeof buf, "%sComparisonLabel %s", track, isAllSamples ? "disabled" : ""); printf("<div><b><span class='%s'>Comparison display:</b></span>", buf); safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_COMPARISON_DISPLAY); selected = cartCgiUsualString(cart, cartVar, GTEX_COMPARISON_DEFAULT); boolean isMirror = sameString(selected, GTEX_COMPARISON_MIRROR); cgiMakeRadioButton(cartVar, GTEX_COMPARISON_DIFF, !isMirror); printf("<span class='%s'>Difference graph</span>", buf); cgiMakeRadioButton(cartVar, GTEX_COMPARISON_MIRROR, isMirror); printf("<span class='%s'>Two graphs</span>\n", buf); printf("</div>");