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.

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

Introduces CryptoService as a wrapper around sha384 lib. #3841

Merged
merged 7 commits into from
Jun 30, 2016

Conversation

lannka
Copy link
Contributor

@lannka lannka commented Jun 29, 2016

This is a preparation for a later refactory to browser native crypto API. #3690

…eparation for a later refactory to browser native crypto API.
const keyPromise = urlReplacementsFor(this.getWin()).expand(key);
const cryptoPromise = cryptoFor(this.getWin());
return Promise.all([keyPromise, cryptoPromise])
.then(([key, crypto]) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, this works?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Seems working, at least under chrome. Is it something new?
On Jun 29, 2016 5:09 PM, "Malte Ubl" [email protected] wrote:

In extensions/amp-analytics/0.1/amp-analytics.js
#3841 (comment):

@@ -415,13 +414,14 @@ export class AmpAnalytics extends AMP.BaseElement {
}
const key = this.expandTemplate_(spec['sampleOn'], trigger);

  • return urlReplacementsFor(this.getWin()).expand(key).then(key => {
  •  const digest = this.sha384_(key);
    
  •  if (digest[0] % 100 < spec['threshold']) {
    
  •    return resolve;
    
  •  }
    
  •  return Promise.resolve(false);
    
  • });
  • const keyPromise = urlReplacementsFor(this.getWin()).expand(key);
  • const cryptoPromise = cryptoFor(this.getWin());
  • return Promise.all([keyPromise, cryptoPromise])
  •    .then(([key, crypto]) => {
    

Wow, this works?


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
https://github.com/ampproject/amphtml/pull/3841/files/ad4493954bc4e6803beefa696a9284258ecd4f00#r69050419,
or mute the thread
https://github.com/notifications/unsubscribe/ANd2kIU8IoiJL-4whBCC0Pyo8dEMUOxKks5qQwlMgaJpZM4JBrfz
.

You received this message because you are subscribed to the Google Groups
"amphtml-eng-github" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit
https://groups.google.com/a/google.com/d/msgid/amphtml-eng-github/ampproject/amphtml/pull/3841/r69050419%40github.com
https://groups.google.com/a/google.com/d/msgid/amphtml-eng-github/ampproject/amphtml/pull/3841/r69050419%40github.com?utm_medium=email&utm_source=footer
.

Copy link
Member

@erwinmombay erwinmombay Jun 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the output this will produce is pretty bad btw, closure compiler will start using Symbol's and iterator protocol. (even babel will use sliceIterator, unless in loose mode). any destructuring will produce this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to know. Fixed. Thanks!

* @param {!Window} window
* @return {!Promise<!Crypto>}
*/
export function cryptoFor(window) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forbid/whitelist usage with presubmit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What type of presubmit check for the usage of 'cryptoFor'?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check for installCryptoService is already added.
I thought you were also asking for a check for cryptoFor()

@cramforce
Copy link
Member

Nice!

@lannka lannka changed the title [WIP] Introduces CryptoService as a wrapper around sha384 lib. Introduces CryptoService as a wrapper around sha384 lib. Jun 30, 2016
@lannka
Copy link
Contributor Author

lannka commented Jun 30, 2016

Ready for review now. PTAL

});
return Promise.resolve(newCookie);
Promise.all([newCookiePromise, persistenceConsent])
.then(([newCookie]) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and elsewhere are some more instances of the magic de-composition. We should catch this in the linter if the generated code sucks. Really sad.

@cramforce
Copy link
Member

LGTM

@lannka lannka merged commit 3a0e42c into ampproject:master Jun 30, 2016
@lannka lannka deleted the crypto branch June 30, 2016 17:07
const crypto = results[1];
return crypto.sha384(key);
}).then(digest => {
return Promise.resolve(digest[0] % 100 < spec['threshold']);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just return here, no need to return a Promise inside a #then block.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants