Skip to content

Commit c05ccea

Browse files
benjaminPariseltaki-eddine-rahal
authored andcommitted
fix: Allow to build
fix: grunt package is working fix(angular.merge): do not merge __proto__ property Report from * angular@c0498d4 * angular@add78e6 fix($compile): properly sanitize xlink:href attribute interoplation Closes angular#12524 (cherry picked from commit f33ce17) Build version on windows Build version on windows Update ReadMe for Windows environment Update ReadMe Fix Unit Test Fix Unit Test Fix Unit Test Fix Test e2e Fix Test e2e Fix Test e2e Fix Test e2e Fix npm:angular:20150909 Test and Validation CVE npm:angular:20150909 fix($sanitize): disallow unsafe svg animation tags and add mXSS protection
1 parent b879223 commit c05ccea

28 files changed

+59960
-10899
lines changed

README.md

+23-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AngularJS [![Build Status](https://travis-ci.org/angular/angular.js.svg?branch=master)](https://travis-ci.org/angular/angular.js)
1+
2+
AngularJS
23
=========
34

45
AngularJS lets you write client-side web applications as if you had a smarter browser. It lets you
@@ -8,7 +9,7 @@ synchronizes data from your UI (view) with your JavaScript objects (model) throu
89
binding. To help you structure your application better and make it easy to test, AngularJS teaches
910
the browser how to do dependency injection and inversion of control.
1011

11-
Oh yeah and it helps with server-side communication, taming async callbacks with promises and
12+
Oh yeah and it helps with server-side communication, taming async callbacks with promises and
1213
deferreds. It also makes client-side navigation and deeplinking with hashbang urls or HTML5 pushState a
1314
piece of cake. Best of all?? It makes development fun!
1415

@@ -20,14 +21,32 @@ piece of cake. Best of all?? It makes development fun!
2021
* Dashboard: http://dashboard.angularjs.org
2122

2223
Building AngularJS
23-
---------
24+
=========
2425
[Once you have your environment setup](http://docs.angularjs.org/misc/contribute) just run:
2526

2627
grunt package
2728

29+
Building AngularJS v1.3.x
30+
=========
31+
32+
Fork from angularjs for Bonitasoft.
33+
To make branch v1.3.x working, we need to:
34+
35+
1. Git checkout v1.3.x
36+
37+
2. Install node version 16.10.0 (with npm version 7.24.0)
38+
39+
3. Install tools and dependencies
40+
- Run: npm install -g grunt-cli@0.1.13
41+
- Install python2.7.18 (https://tecadmin.net/install-python-2-7-on-ubuntu-and-linuxmint/)
42+
- Run: npm i
43+
44+
4. Build Project
45+
- Run: grunt package
46+
2847

2948
Running Tests
30-
-------------
49+
=========
3150
To execute all unit tests, use:
3251

3352
grunt test:unit

docs/app/e2e/api-docs/api-pages.scenario.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe("doc.angularjs.org", function() {
2929
// Ensure that the page is loaded before trying to switch frames.
3030
browser.waitForAngular();
3131

32-
browser.switchTo().frame('example-input-directive');
32+
browser.switchTo().frame(0).then();
3333

3434
var nameInput = element(by.model('user.name'));
3535
nameInput.sendKeys('!!!');
@@ -48,4 +48,4 @@ describe("doc.angularjs.org", function() {
4848
});
4949
});
5050
});
51-
});
51+
});

docs/app/e2e/app.scenario.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

3-
var webdriver = require('protractor/node_modules/selenium-webdriver');
3+
var webdriver = require('selenium-webdriver');
4+
// protractor/node_modules/selenium-webdriver
45

56
describe('docs.angularjs.org', function () {
67

@@ -83,4 +84,4 @@ describe('docs.angularjs.org', function () {
8384

8485
});
8586

86-
});
87+
});
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@ngdoc error
2+
@name $sanitize:uinput
3+
@fullName Failed to sanitize html because the input is unstable
4+
@description
5+
6+
This error occurs when `$sanitize` sanitizer tries to check the input for possible mXSS payload and the verification
7+
errors due to the input mutating indefinitely. This could be a sign that the payload contains code exploiting an mXSS
8+
vulnerability in the browser.
9+
10+
mXSS attack exploit browser bugs that cause some browsers parse a certain html strings into DOM, which once serialized
11+
doesn't match the original input. These browser bugs can be exploited by attackers to create payload which looks
12+
harmless to sanitizers, but due to mutations caused by the browser are turned into dangerous code once processed after
13+
sanitization.

karma-shared.conf.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -162,16 +162,16 @@ module.exports = function(config, specificOptions) {
162162
'/someSanitizedUrl',
163163
'/{{testUrl}}'
164164
];
165-
var log4js = require('./node_modules/karma/node_modules/log4js');
166-
var layouts = require('./node_modules/karma/node_modules/log4js/lib/layouts');
165+
166+
var log4js = require('./node_modules/log4js');
167+
var layouts = require('./node_modules/log4js/lib/layouts');
168+
167169
var originalConfigure = log4js.configure;
168170
log4js.configure = function(log4jsConfig) {
169171
var consoleAppender = log4jsConfig.appenders.shift();
170172
var originalResult = originalConfigure.call(log4js, log4jsConfig);
171173
var layout = layouts.layout(consoleAppender.layout.type, consoleAppender.layout);
172174

173-
174-
175175
log4js.addAppender(function(log) {
176176
var msg = log.data[0];
177177

lib/grunt/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ module.exports = {
220220
java32flags: function(){
221221
if (process.platform === "win32") return '';
222222
if (shell.exec('java -version -d32 2>&1', {silent: true}).code !== 0) return '';
223-
return ' -d32 -client';
223+
return '';
224224
},
225225

226226

lib/htmlparser/htmlparser.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
chars = false;
7373
}
7474

75-
// end tag
75+
// end tag
7676
} else if ( html.indexOf("</") == 0 ) {
7777
match = html.match( endTag );
7878

@@ -82,7 +82,7 @@
8282
chars = false;
8383
}
8484

85-
// start tag
85+
// start tag
8686
} else if ( html.indexOf("<") == 0 ) {
8787
match = html.match( startTag );
8888

@@ -147,8 +147,8 @@
147147
rest.replace(attr, function(match, name) {
148148
var value = arguments[2] ? arguments[2] :
149149
arguments[3] ? arguments[3] :
150-
arguments[4] ? arguments[4] :
151-
fillAttrs[name] ? name : "";
150+
arguments[4] ? arguments[4] :
151+
fillAttrs[name] ? name : "";
152152

153153
attrs.push({
154154
name: name,

0 commit comments

Comments
 (0)