Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-03-09 16:54:15 +0300
committerGitHub <noreply@github.com>2020-03-09 16:54:15 +0300
commit0ca7356bbeb37074495d98896a7f8ed6d28eeaa1 (patch)
tree5f61a7c48aaae5ad68b61efae8cd7a1921eabd29 /matomo.js
parentddb12120d76d114499be19b788c3b0b3241a2af4 (diff)
fix #15681 secure cookie flag is not set for referrer and custom dimensions (#15683)
* fix #15681 secure cookie flag is not set for referrer and custom dimensions * rebuilt piwik.js Co-authored-by: sgiehl <sgiehl@users.noreply.github.com>
Diffstat (limited to 'matomo.js')
-rw-r--r--matomo.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/matomo.js b/matomo.js
index 1d4a64a4a0..73dc8589eb 100644
--- a/matomo.js
+++ b/matomo.js
@@ -38,8 +38,8 @@ c0(di,null,false)}cd(df)})}function aS(df){return bi+df+"."+b3+"."+bm}function b
}if(A(T.GearsFactory)){c4.gears="1"}c4.cookie=b2()}var dh=parseInt(X.width,10);var df=parseInt(X.height,10);c4.res=parseInt(dh,10)+"x"+parseInt(df,10);return c4}function bU(){var dg=aS("cvar"),df=aC(dg);if(df.length){df=T.JSON.parse(df);if(W(df)){return df}}return{}}function cA(){if(aP===false){aP=bU()}}function cM(){var df=cD();return b4((h.userAgent||"")+(h.platform||"")+T.JSON.stringify(df)+(new Date()).getTime()+Math.random()).slice(0,16)}function az(){var df=cD();return b4((h.userAgent||"")+(h.platform||"")+T.JSON.stringify(df)).slice(0,6)}function be(){return Math.floor((new Date()).getTime()/1000)}function aI(){var dg=be();var dh=az();var df=String(dg)+dh;return df}function cY(dh){dh=String(dh);var dk=az();var di=dk.length;var dj=dh.substr(-1*di,di);var dg=parseInt(dh.substr(0,dh.length-di),10);if(dg&&dj&&dj===dk){var df=be();if(aY<=0){return true}if(df>=dg&&df<=(dg+aY)){return true}}return false}function dd(df){if(!cI){return""}var dj=f(df,av);if(!dj){return""}dj=String(dj);var dh=new RegExp("^[a-zA-Z0-9]+$");
if(dj.length===32&&dh.test(dj)){var dg=dj.substr(16,32);if(cY(dg)){var di=dj.substr(0,16);return di}}return""}function cJ(){if(!bL){bL=dd(bK)}var dh=new Date(),df=Math.round(dh.getTime()/1000),dg=aS("id"),dk=aC(dg),dj,di;if(dk){dj=dk.split(".");dj.unshift("0");if(bL.length){dj[1]=bL}return dj}if(bL.length){di=bL}else{if("0"===b2()){di=""}else{di=cM()}}dj=["1",di,df,0,df,"",""];return dj}function aX(){var dm=cJ(),di=dm[0],dj=dm[1],dg=dm[2],df=dm[3],dk=dm[4],dh=dm[5];if(!J(dm[6])){dm[6]=""}var dl=dm[6];return{newVisitor:di,uuid:dj,createTs:dg,visitCount:df,currentVisitTs:dk,lastVisitTs:dh,lastEcommerceOrderTs:dl}}function aG(){var di=new Date(),dg=di.getTime(),dj=aX().createTs;var df=parseInt(dj,10);var dh=(df*1000)+cF-dg;return dh}function aL(df){if(!b3){return}var dh=new Date(),dg=Math.round(dh.getTime()/1000);if(!J(df)){df=aX()}var di=df.uuid+"."+df.createTs+"."+df.visitCount+"."+dg+"."+df.lastVisitTs+"."+df.lastEcommerceOrderTs;da(aS("id"),di,aG(),bn,cT,bP)}function bJ(){var df=aC(aS("ref"));
if(df.length){try{df=T.JSON.parse(df);if(W(df)){return df}}catch(dg){}}return["","",0,""]}function bu(dg){var df="testvalue";da("test",df,10000,null,dg);if(aC("test")===df){bV("test",null,dg);return true}return false}function aE(){var dg=bj;bj=false;var df,dh;for(df=0;df<bs.length;df++){dh=aS(bs[df]);if(dh!==cH&&dh!==bc&&0!==aC(dh)){bV(dh,bn,cT)}}bj=dg}function b0(df){b3=df;aL()}function de(dj){if(!dj||!W(dj)){return}var di=[];var dh;for(dh in dj){if(Object.prototype.hasOwnProperty.call(dj,dh)){di.push(dh)}}var dk={};di.sort();var df=di.length;var dg;for(dg=0;dg<df;dg++){dk[di[dg]]=dj[di[dg]]}return dk}function ca(){da(aS("ses"),"1",cm,bn,cT,bP)}function bf(){var di="";var dg="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";var dh=dg.length;var df;for(df=0;df<6;df++){di+=dg.charAt(Math.floor(Math.random()*dh))}return di}function cq(dh,dD,dE,di){var dC,dg=new Date(),dq=Math.round(dg.getTime()/1000),dm,dB,dj=1024,dK,dr,dz=aP,dk=aS("ses"),dx=aS("ref"),du=aS("cvar"),dv=aC(dk),dA=bJ(),dG=a3||bK,dn,df;
-if(bj){aE()}if(cL){return""}var dw=aX();if(!J(di)){di=""}var dt=G.characterSet||G.charset;if(!dt||dt.toLowerCase()==="utf-8"){dt=null}dn=dA[0];df=dA[1];dm=dA[2];dB=dA[3];if(!dv){var dF=cm/1000;if(!dw.lastVisitTs||(dq-dw.lastVisitTs)>dF){dw.visitCount++;dw.lastVisitTs=dw.currentVisitTs}if(!bt||!dn.length){for(dC in co){if(Object.prototype.hasOwnProperty.call(co,dC)){dn=f(dG,co[dC]);if(dn.length){break}}}for(dC in bD){if(Object.prototype.hasOwnProperty.call(bD,dC)){df=f(dG,bD[dC]);if(df.length){break}}}}dK=d(bl);dr=dB.length?d(dB):"";if(dK.length&&!aU(dK)&&(!bt||!dr.length||aU(dr))){dB=bl}if(dB.length||dn.length){dm=dq;dA=[dn,df,dm,bZ(dB.slice(0,dj))];da(dx,T.JSON.stringify(dA),c1,bn,cT)}}dh+="&idsite="+b3+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dg.getHours()+"&m="+dg.getMinutes()+"&s="+dg.getSeconds()+"&url="+t(bZ(dG))+(bl.length?"&urlref="+t(bZ(bl)):"")+((bw&&bw.length)?"&uid="+t(bw):"")+"&_id="+dw.uuid+"&_idts="+dw.createTs+"&_idvc="+dw.visitCount+"&_idn="+dw.newVisitor+(dn.length?"&_rcn="+t(dn):"")+(df.length?"&_rck="+t(df):"")+"&_refts="+dm+"&_viewts="+dw.lastVisitTs+(String(dw.lastEcommerceOrderTs).length?"&_ects="+dw.lastEcommerceOrderTs:"")+(String(dB).length?"&_ref="+t(bZ(dB.slice(0,dj))):"")+(dt?"&cs="+t(dt):"")+"&send_image=0";
-var dJ=cD();for(dC in dJ){if(Object.prototype.hasOwnProperty.call(dJ,dC)){dh+="&"+dC+"="+dJ[dC]}}var dI=[];if(dD){for(dC in dD){if(Object.prototype.hasOwnProperty.call(dD,dC)&&/^dimension\d+$/.test(dC)){var dl=dC.replace("dimension","");dI.push(parseInt(dl,10));dI.push(String(dl));dh+="&"+dC+"="+t(dD[dC]);delete dD[dC]}}}if(dD&&B(dD)){dD=null}for(dC in bk){if(Object.prototype.hasOwnProperty.call(bk,dC)){var ds=(-1===M(dI,dC));if(ds){dh+="&dimension"+dC+"="+t(bk[dC])}}}if(dD){dh+="&data="+t(T.JSON.stringify(dD))}else{if(ao){dh+="&data="+t(T.JSON.stringify(ao))}}function dp(dL,dM){var dN=T.JSON.stringify(dL);if(dN.length>2){return"&"+dM+"="+t(dN)}return""}var dH=de(bT);var dy=de(cj);dh+=dp(dH,"cvar");dh+=dp(dy,"e_cvar");if(aP){dh+=dp(aP,"_cvar");for(dC in dz){if(Object.prototype.hasOwnProperty.call(dz,dC)){if(aP[dC][0]===""||aP[dC][1]===""){delete aP[dC]}}}if(bN){da(du,T.JSON.stringify(aP),cm,bn,cT)}}if(a1){if(ck){dh+="&gt_ms="+ck}else{if(i&&i.timing&&i.timing.requestStart&&i.timing.responseEnd){dh+="&gt_ms="+(i.timing.responseEnd-i.timing.requestStart)
+if(bj){aE()}if(cL){return""}var dw=aX();if(!J(di)){di=""}var dt=G.characterSet||G.charset;if(!dt||dt.toLowerCase()==="utf-8"){dt=null}dn=dA[0];df=dA[1];dm=dA[2];dB=dA[3];if(!dv){var dF=cm/1000;if(!dw.lastVisitTs||(dq-dw.lastVisitTs)>dF){dw.visitCount++;dw.lastVisitTs=dw.currentVisitTs}if(!bt||!dn.length){for(dC in co){if(Object.prototype.hasOwnProperty.call(co,dC)){dn=f(dG,co[dC]);if(dn.length){break}}}for(dC in bD){if(Object.prototype.hasOwnProperty.call(bD,dC)){df=f(dG,bD[dC]);if(df.length){break}}}}dK=d(bl);dr=dB.length?d(dB):"";if(dK.length&&!aU(dK)&&(!bt||!dr.length||aU(dr))){dB=bl}if(dB.length||dn.length){dm=dq;dA=[dn,df,dm,bZ(dB.slice(0,dj))];da(dx,T.JSON.stringify(dA),c1,bn,cT,bP)}}dh+="&idsite="+b3+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dg.getHours()+"&m="+dg.getMinutes()+"&s="+dg.getSeconds()+"&url="+t(bZ(dG))+(bl.length?"&urlref="+t(bZ(bl)):"")+((bw&&bw.length)?"&uid="+t(bw):"")+"&_id="+dw.uuid+"&_idts="+dw.createTs+"&_idvc="+dw.visitCount+"&_idn="+dw.newVisitor+(dn.length?"&_rcn="+t(dn):"")+(df.length?"&_rck="+t(df):"")+"&_refts="+dm+"&_viewts="+dw.lastVisitTs+(String(dw.lastEcommerceOrderTs).length?"&_ects="+dw.lastEcommerceOrderTs:"")+(String(dB).length?"&_ref="+t(bZ(dB.slice(0,dj))):"")+(dt?"&cs="+t(dt):"")+"&send_image=0";
+var dJ=cD();for(dC in dJ){if(Object.prototype.hasOwnProperty.call(dJ,dC)){dh+="&"+dC+"="+dJ[dC]}}var dI=[];if(dD){for(dC in dD){if(Object.prototype.hasOwnProperty.call(dD,dC)&&/^dimension\d+$/.test(dC)){var dl=dC.replace("dimension","");dI.push(parseInt(dl,10));dI.push(String(dl));dh+="&"+dC+"="+t(dD[dC]);delete dD[dC]}}}if(dD&&B(dD)){dD=null}for(dC in bk){if(Object.prototype.hasOwnProperty.call(bk,dC)){var ds=(-1===M(dI,dC));if(ds){dh+="&dimension"+dC+"="+t(bk[dC])}}}if(dD){dh+="&data="+t(T.JSON.stringify(dD))}else{if(ao){dh+="&data="+t(T.JSON.stringify(ao))}}function dp(dL,dM){var dN=T.JSON.stringify(dL);if(dN.length>2){return"&"+dM+"="+t(dN)}return""}var dH=de(bT);var dy=de(cj);dh+=dp(dH,"cvar");dh+=dp(dy,"e_cvar");if(aP){dh+=dp(aP,"_cvar");for(dC in dz){if(Object.prototype.hasOwnProperty.call(dz,dC)){if(aP[dC][0]===""||aP[dC][1]===""){delete aP[dC]}}}if(bN){da(du,T.JSON.stringify(aP),cm,bn,cT,bP)}}if(a1){if(ck){dh+="&gt_ms="+ck}else{if(i&&i.timing&&i.timing.requestStart&&i.timing.responseEnd){dh+="&gt_ms="+(i.timing.responseEnd-i.timing.requestStart)
}}}if(aK){dh+="&pv_id="+aK}dw.lastEcommerceOrderTs=J(di)&&String(di).length?di:dw.lastEcommerceOrderTs;aL(dw);ca();dh+=ac(dE,{tracker:bF,request:dh});if(cV.length){dh+="&"+cV}if(A(b8)){dh=b8(dh)}return dh}bO=function a6(){var df=new Date();df=df.getTime();if(!cU){return false}if((cU+(1000*c3))<=df){return false}if(cU+a4<=df){bF.ping();return true}return false};function bo(di,dh,dn,dj,df,dr){var dl="idgoal=0",dm,dg=new Date(),dp=[],dq,dk=String(di).length;if(dk){dl+="&ec_id="+t(di);dm=Math.round(dg.getTime()/1000)}dl+="&revenue="+dh;if(String(dn).length){dl+="&ec_st="+dn}if(String(dj).length){dl+="&ec_tx="+dj}if(String(df).length){dl+="&ec_sh="+df}if(String(dr).length){dl+="&ec_dt="+dr}if(cW){for(dq in cW){if(Object.prototype.hasOwnProperty.call(cW,dq)){if(!J(cW[dq][1])){cW[dq][1]=""}if(!J(cW[dq][2])){cW[dq][2]=""}if(!J(cW[dq][3])||String(cW[dq][3]).length===0){cW[dq][3]=0}if(!J(cW[dq][4])||String(cW[dq][4]).length===0){cW[dq][4]=1}dp.push(cW[dq])}}dl+="&ec_items="+t(T.JSON.stringify(dp))
}dl=cq(dl,ao,"ecommerce",dm);bC(dl,bG);if(dk){cW={}}}function bW(df,dj,di,dh,dg,dk){if(String(df).length&&J(dj)){bo(df,dj,di,dh,dg,dk)}}function bq(df){if(J(df)){bo("",df,"","","","")}}function bX(dg,di,dh){aK=bf();var df=cq("action_name="+t(al(dg||bh)),di,"log");bC(df,bG,dh)}function aZ(dh,dg){var di,df="(^| )(piwik[_-]"+dg;if(dh){for(di=0;di<dh.length;di++){df+="|"+dh[di]}}df+=")( |$)";return new RegExp(df)}function aT(df){return(aD&&df&&0===String(df).indexOf(aD))}function cs(dj,df,dk,dg){if(aT(df)){return 0}var di=aZ(bI,"download"),dh=aZ(a7,"link"),dl=new RegExp("\\.("+c2.join("|")+")([?&#]|$)","i");if(dh.test(dj)){return"link"}if(dg||di.test(dj)||dl.test(df)){return"download"}if(dk){return 0}return"link"}function au(dg){var df;df=dg.parentNode;while(df!==null&&J(df)){if(ae.isLinkElement(dg)){break}dg=df;df=dg.parentNode}return dg}function c8(dk){dk=au(dk);if(!ae.hasNodeAttribute(dk,"href")){return}if(!J(dk.href)){return}var dj=ae.getAttributeValueFromNode(dk,"href");var dg=dk.pathname||ci(dk.href);
var dl=dk.hostname||d(dk.href);var dm=dl.toLowerCase();var dh=dk.href.replace(dl,dm);var di=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):","i");if(!di.test(dh)){var df=cs(dk.className,dh,ar(dm,dg),ae.hasNodeAttribute(dk,"download"));if(df){return{type:df,href:dh}}}}function aO(df,dg,dh,di){var dj=v.buildInteractionRequestParams(df,dg,dh,di);if(!dj){return}return cq(dj,null,"contentInteraction")}function ba(df,dg){if(!df||!dg){return false}var dh=v.findTargetNode(df);if(v.shouldIgnoreInteraction(dh)){return false}dh=v.findTargetNodeNoDefault(df);if(dh&&!V(dh,dg)){return false}return true}function cr(dh,dg,dj){if(!dh){return}var df=v.findParentContentNode(dh);if(!df){return}if(!ba(df,dh)){return}var di=v.buildContentBlock(df);if(!di){return}if(!di.target&&dj){di.target=dj}return v.buildInteractionRequestParams(dg,di.name,di.piece,di.target)}function aV(dg){if(!b7||!b7.length){return false}var df,dh;for(df=0;df<b7.length;df++){dh=b7[df];if(dh&&dh.name===dg.name&&dh.piece===dg.piece&&dh.target===dg.target){return true