Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly sanitize certain iframe attributes #173

Merged
merged 1 commit into from
Feb 26, 2020
Merged

Correctly sanitize certain iframe attributes #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion lib/amperize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ Amperize.prototype.traverse = async function traverse(data, html, done) {
return enter();
}

var youtubeId = element.attribs.src.match(/^.*(youtu.be\/|youtube(-nocookie)?.com\/(v\/|.*u\/\w\/|embed\/|.*v=))([\w-]{11}).*/)
var youtubeId = element.attribs.src.match(/^.*(youtu.be\/|youtube(-nocookie)?.com\/(v\/|.*u\/\w\/|embed\/|.*v=))([\w-]{11}).*/);
useSecureSchema(element);

if (youtubeId) {
Expand All @@ -312,6 +312,30 @@ Amperize.prototype.traverse = async function traverse(data, html, done) {
element.attribs.sandbox = !element.attribs.sandbox ? self.config['amp-iframe'].sandbox : element.attribs.sandbox;
}

if (element.attribs.hasOwnProperty('frameborder')) {
element.attribs.frameborder = element.attribs.frameborder === '0' ? '0' : '1';
}

if (element.attribs.hasOwnProperty('scrolling')) {
element.attribs.scrolling = element.attribs.scrolling === '0' ? '0' : '1';
}

if (element.attribs.hasOwnProperty('allowfullscreen')) {
if (element.attribs.allowfullscreen === 'false') {
delete element.attribs.allowfullscreen;
} else {
element.attribs.allowfullscreen = '';
}
}

if (element.attribs.hasOwnProperty('allowtransparency')) {
if (element.attribs.allowtransparency === 'false') {
delete element.attribs.allowtransparency;
} else {
element.attribs.allowtransparency = '';
}
}

if (!element.attribs.width || !element.attribs.height || !element.attribs.layout) {
element.attribs.width = !element.attribs.width ? self.config['amp-iframe'].width : element.attribs.width;
element.attribs.height = !element.attribs.height ? self.config['amp-iframe'].height : element.attribs.height;
Expand Down
112 changes: 110 additions & 2 deletions test/amperize.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('Amperize', function () {
width: 600,
height: 400
},
'request_timeout': 3000
request_timeout: 3000
});
});

Expand Down Expand Up @@ -364,6 +364,114 @@ describe('Amperize', function () {
});
});

it('transforms <iframe> with frameborder=0 to preserve frameborder=0', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" frameborder="0"></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('frameborder="0"');
done();
});
});

it('transforms <iframe> with frameborder=1 to preserve frameborder=1', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" frameborder="1"></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('frameborder="1"');
done();
});
});

it('transforms <iframe> with frameborder to frameborder=1', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" frameborder></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('frameborder="1"');
done();
});
});

it('transforms <iframe> with scrolling=0 to preserve scrolling=0', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" scrolling="0"></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('scrolling="0"');
done();
});
});

it('transforms <iframe> with scrolling=1 to preserve scrolling=1', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" scrolling="1"></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('scrolling="1"');
done();
});
});

it('transforms <iframe> with scrolling to scrolling=1', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" scrolling></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('scrolling="1"');
done();
});
});

it('transforms <iframe> with allowfullscreen to allowfullscreen=""', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" allowfullscreen=""></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('allowfullscreen=""');
done();
});
});

it('transforms <iframe> with allowfullscreen="true" to allowfullscreen=""', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" allowfullscreen="true"></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('allowfullscreen=""');
done();
});
});

it('transforms <iframe> with allowfullscreen="false" to remove allowfullscreen', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" allowfullscreen="false"></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.not.contain('allowfullscreen');
done();
});
});

it('transforms <iframe> with allowtransparency to allowtransparency=""', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" allowtransparency></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('allowtransparency=""');
done();
});
});

it('transforms <iframe> with allowtransparency="true" to allowtransparency=""', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" allowtransparency="true"></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.contain('allowtransparency=""');
done();
});
});

it('transforms <iframe> with allowtransparency="false" to remove allowtransparency', function (done) {
amperize.parse('<iframe src="https://giphy.com/embed/3oEduKP4VaUxJvLwuA" allowtransparency="false"></iframe>', function (error, result) {
expect(result).to.exist;
expect(result).to.contain('<amp-iframe');
expect(result).to.not.contain('allowtransparency');
done();
});
});

it('transforms <iframe> with youtube URL to <amp-youtube></amp-youtube>', function (done) {
amperize.parse('<iframe src="https://www.youtube.com/embed/HMQkV5cTuoY" height="400"></iframe>', function (error, result) {
expect(result).to.exist;
Expand Down Expand Up @@ -516,7 +624,7 @@ describe('Amperize', function () {
expect(result).to.contain('</amp-audio>');
done();
});
})
});

it('can handle redirects', function (done) {
var secondImageSizeMock;
Expand Down