Merge pull request #14357 from NejcZdovc/fix/#14356-block

Adds captcha block overlay
brave · Jun 8, 2018 · f5d7d50 · f5d7d50
1 parent d287db8
commit f5d7d50
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 19 deletions.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -197,7 +197,11 @@ const paymentPresent = (state, tabId, present) => {
 
   if (!present) {
     const status = ledgerState.getPromotionProp(state, 'promotionStatus')
-    if (status === promotionStatuses.CAPTCHA_CHECK || status === promotionStatuses.CAPTCHA_ERROR) {
+    if (
+      status === promotionStatuses.CAPTCHA_CHECK ||
+      status === promotionStatuses.CAPTCHA_ERROR ||
+      status === promotionStatuses.CAPTCHA_BLOCK
+    ) {
       state = ledgerState.setPromotionProp(state, 'promotionStatus', null)
     }
   }
@@ -1827,9 +1831,8 @@ const generatePaymentData = (state) => {
 
 const getPaymentInfo = (state) => {
   let amount, currency
-  const inProgress = ledgerState.getAboutProp(state, 'status') === ledgerStatuses.IN_PROGRESS
 
-  if (!client || inProgress) {
+  if (!client) {
     return state
   }
 
@@ -3030,20 +3033,24 @@ const getCaptcha = (state) => {
     return
   }
 
-  client.getPromotionCaptcha(promotion.get('promotionId'), (err, body) => {
+  client.getPromotionCaptcha(promotion.get('promotionId'), (err, body, response) => {
     if (err) {
       console.error(`Problem getting promotion captcha ${err.toString()}`)
-      appActions.onCaptchaResponse(null)
+      appActions.onCaptchaResponse(response, null)
+      return
     }
 
-    appActions.onCaptchaResponse(body)
+    appActions.onCaptchaResponse(null, body)
   })
 }
 
-const onCaptchaResponse = (state, body) => {
+const onCaptchaResponse = (state, response, body) => {
   if (body == null) {
-    state = ledgerState.setPromotionProp(state, 'promotionStatus', promotionStatuses.CAPTCHA_ERROR)
-    return state
+    if (response && response.get('statusCode') === 429) {
+      return ledgerState.setPromotionProp(state, 'promotionStatus', promotionStatuses.CAPTCHA_BLOCK)
+    }
+
+    return ledgerState.setPromotionProp(state, 'promotionStatus', promotionStatuses.CAPTCHA_ERROR)
   }
 
   const image = `data:image/jpeg;base64,${Buffer.from(body).toString('base64')}`
@@ -3088,6 +3095,9 @@ const onPromotionResponse = (state, status) => {
       // captcha verification failed
       state = ledgerState.setPromotionProp(state, 'promotionStatus', promotionStatuses.CAPTCHA_ERROR)
       module.exports.getCaptcha(state)
+    } else if (status.get('statusCode') === 429) {
+      // too many attempts
+      state = ledgerState.setPromotionProp(state, 'promotionStatus', promotionStatuses.CAPTCHA_BLOCK)
     } else {
       // general error
       state = ledgerState.setPromotionProp(state, 'promotionStatus', promotionStatuses.GENERAL_ERROR)
@@ -3099,7 +3109,8 @@ const onPromotionResponse = (state, status) => {
 
   if (
     currentStatus === promotionStatuses.CAPTCHA_ERROR ||
-    currentStatus === promotionStatuses.CAPTCHA_CHECK
+    currentStatus === promotionStatuses.CAPTCHA_CHECK ||
+    currentStatus === promotionStatuses.CAPTCHA_BLOCK
   ) {
     state = ledgerState.setPromotionProp(state, 'promotionStatus', null)
   }

diff --git a/app/browser/reducers/ledgerReducer.js b/app/browser/reducers/ledgerReducer.js
@@ -441,7 +441,7 @@ const ledgerReducer = (state, action, immutableAction) => {
       }
     case appConstants.APP_ON_CAPTCHA_RESPONSE:
       {
-        state = ledgerApi.onCaptchaResponse(state, action.get('body'))
+        state = ledgerApi.onCaptchaResponse(state, action.get('response'), action.get('body'))
         break
       }
     case appConstants.APP_ON_CAPTCHA_CLOSE:

diff --git a/app/common/constants/promotionStatuses.js b/app/common/constants/promotionStatuses.js
@@ -6,6 +6,7 @@ const statuses = {
   GENERAL_ERROR: 'generalError',
   PROMO_EXPIRED: 'expiredError',
   CAPTCHA_CHECK: 'captchaCheck',
+  CAPTCHA_BLOCK: 'captchaBlock',
   CAPTCHA_ERROR: 'captchaError'
 }
 

diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -264,6 +264,8 @@ printKeys=Print key
 privacy=Privacy
 privateData=Private Data
 privateDataMessage=Clear the following data types when I close Brave
+promotionCaptchaBlockTitle=Uh-oh.
+promotionCaptchaBlockMessage=We’ve detected too many attempts to claim tokens from your network. Please try again in a few hours.
 promotionCaptchaTitle=Almost there!
 promotionCaptchaErrorTitle=Hmmm…not quite.
 promotionCaptchaErrorText=Please try again.

diff --git a/app/locale.js b/app/locale.js
@@ -285,6 +285,8 @@ var rendererIdentifiers = function () {
     'promotionClaimedErrorMessage',
     'promotionClaimedErrorText',
     'promotionClaimedErrorTitle',
+    'promotionCaptchaBlockTitle',
+    'promotionCaptchaBlockMessage',
     'corruptedOverlayTitle',
     'corruptedOverlayMessage',
     'corruptedOverlayText',

diff --git a/app/renderer/components/preferences/payment/enabledContent.js b/app/renderer/components/preferences/payment/enabledContent.js
@@ -310,6 +310,13 @@ class EnabledContent extends ImmutableComponent {
               text = locale.translation('promotionClaimedErrorText')
               break
             }
+          case promotionStatuses.CAPTCHA_BLOCK:
+            {
+              title = locale.translation('promotionCaptchaBlockTitle')
+              message = locale.translation('promotionCaptchaBlockMessage')
+              text = ' '
+              break
+            }
           case promotionStatuses.CAPTCHA_CHECK:
           case promotionStatuses.CAPTCHA_ERROR:
             {

diff --git a/app/sessionStore.js b/app/sessionStore.js
@@ -416,7 +416,11 @@ module.exports.cleanAppData = (immutableData, isShutdown) => {
 
   if (isShutdown) {
     const status = ledgerState.getPromotionProp(immutableData, 'promotionStatus')
-    if (status === promotionStatuses.CAPTCHA_CHECK || status === promotionStatuses.CAPTCHA_ERROR) {
+    if (
+      status === promotionStatuses.CAPTCHA_CHECK ||
+      status === promotionStatuses.CAPTCHA_BLOCK ||
+      status === promotionStatuses.CAPTCHA_ERROR
+    ) {
       immutableData = ledgerState.setPromotionProp(immutableData, 'promotionStatus', null)
     }
   }

diff --git a/js/actions/appActions.js b/js/actions/appActions.js
@@ -1859,10 +1859,11 @@ const appActions = {
     })
   },
 
-  onCaptchaResponse: function (body) {
+  onCaptchaResponse: function (response, body) {
     dispatch({
       actionType: appConstants.APP_ON_CAPTCHA_RESPONSE,
-      body
+      body,
+      response
     })
   },
 

diff --git a/test/unit/app/browser/api/ledgerTest.js b/test/unit/app/browser/api/ledgerTest.js
@@ -1957,6 +1957,16 @@ describe('ledger api unit tests', function () {
         assert.deepEqual(result.toJS(), expectedSate.toJS())
         assert(getCaptchaSpy.notCalled)
       })
+
+      it('block error', function () {
+        const result = ledgerApi.onPromotionResponse(defaultAppState, Immutable.fromJS({
+          statusCode: 429
+        }))
+        const expectedSate = defaultAppState
+          .setIn(['ledger', 'promotion', 'promotionStatus'], promotionStatuses.CAPTCHA_BLOCK)
+        assert.deepEqual(result.toJS(), expectedSate.toJS())
+        assert(getCaptchaSpy.notCalled)
+      })
     })
   })
 
@@ -3786,11 +3796,25 @@ describe('ledger api unit tests', function () {
       assert.deepEqual(result.toJS(), expectedState.toJS())
     })
 
+    it('responose too many', function () {
+      const expectedState = defaultAppState
+        .setIn(['ledger', 'promotion', 'promotionStatus'], promotionStatuses.CAPTCHA_BLOCK)
+      const result = ledgerApi.onCaptchaResponse(defaultAppState, Immutable.fromJS({statusCode: 429}))
+      assert.deepEqual(result.toJS(), expectedState.toJS())
+    })
+
+    it('responose not found', function () {
+      const expectedState = defaultAppState
+        .setIn(['ledger', 'promotion', 'promotionStatus'], promotionStatuses.CAPTCHA_ERROR)
+      const result = ledgerApi.onCaptchaResponse(defaultAppState, Immutable.fromJS({statusCode: 404}))
+      assert.deepEqual(result.toJS(), expectedState.toJS())
+    })
+
     it('new captcha', function () {
       const expectedState = defaultAppState
         .setIn(['ledger', 'promotion', 'promotionStatus'], promotionStatuses.CAPTCHA_CHECK)
         .setIn(['ledger', 'promotion', 'captcha'], 'data:image/jpeg;base64,/9j/2wA=')
-      const result = ledgerApi.onCaptchaResponse(defaultAppState, body)
+      const result = ledgerApi.onCaptchaResponse(defaultAppState, null, body)
       assert.deepEqual(result.toJS(), expectedState.toJS())
     })
 
@@ -3800,7 +3824,7 @@ describe('ledger api unit tests', function () {
       const expectedState = defaultAppState
         .setIn(['ledger', 'promotion', 'promotionStatus'], promotionStatuses.CAPTCHA_ERROR)
         .setIn(['ledger', 'promotion', 'captcha'], 'data:image/jpeg;base64,/9j/2wA=')
-      const result = ledgerApi.onCaptchaResponse(state, body)
+      const result = ledgerApi.onCaptchaResponse(state, null, body)
       assert.deepEqual(result.toJS(), expectedState.toJS())
     })
   })

diff --git a/test/unit/app/browser/reducers/ledgerReducerTest.js b/test/unit/app/browser/reducers/ledgerReducerTest.js
@@ -1019,12 +1019,26 @@ describe('ledgerReducer unit tests', function () {
       onCaptchaResponseSpy.restore()
     })
 
-    it('execute', function () {
+    it('execute error', function () {
+      ledgerReducer(appState, Immutable.fromJS({
+        actionType: appConstants.APP_ON_CAPTCHA_RESPONSE,
+        body: null,
+        response: {
+          statusCode: 429
+        }
+      }))
+      assert(onCaptchaResponseSpy.withArgs(sinon.match.any, Immutable.fromJS({
+        statusCode: 429
+      }), null).calledOnce)
+    })
+
+    it('execute correct', function () {
       ledgerReducer(appState, Immutable.fromJS({
         actionType: appConstants.APP_ON_CAPTCHA_RESPONSE,
-        body: 1
+        body: 1,
+        response: null
       }))
-      assert(onCaptchaResponseSpy.withArgs(sinon.match.any, 1).calledOnce)
+      assert(onCaptchaResponseSpy.withArgs(sinon.match.any, null, 1).calledOnce)
     })
   })