Skip to content

Commit

Permalink
Merge pull request #108 from wmde/fix-anonymous
Browse files Browse the repository at this point in the history 
Fix data leak when selecting anonymous address type
  • Loading branch information
@moiikana
moiikana committed Jun 28, 2023
2 parents 0ca7b88 + 0e9c2f2 commit d46402c
Show file tree
Hide file tree
Showing 3 changed files with 315 additions and 34 deletions.
39 changes: 27 additions & 12 deletions src/components/pages/donation_form/SubmitValues.vue
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,37 @@
<template>
<span class="submit-values">

<input type="hidden" name="paymentType" :value="payment.type">
<input type="hidden" name="interval" :value="payment.interval">
<input type="hidden" name="amount" :value="payment.amount">

<input type="hidden" name="iban" :value="bankdata.iban">
<input type="hidden" name="bic" :value="bankdata.bic">

<input type="hidden" name="addressType" :value="addressType">

<input type="hidden" name="salutation" :value="address.salutation">
<input type="hidden" name="title" :value="address.title">
<input type="hidden" name="firstName" :value="address.firstName">
<input type="hidden" name="lastName" :value="address.lastName">
<template v-if="sendNameAndEmail">
<input type="hidden" name="salutation" :value="address.salutation">
<input type="hidden" name="title" :value="address.title">
<input type="hidden" name="firstName" :value="address.firstName">
<input type="hidden" name="lastName" :value="address.lastName">
<input type="hidden" name="email" :value="address.email">
</template>

<template v-if="sendPostalAddress">
<input type="hidden" name="street" :value="address.street">
<input type="hidden" name="postcode" :value="address.postcode">
<input type="hidden" name="city" :value="address.city">
<input type="hidden" name="country" :value="address.country">
</template>

<input type="hidden" name="companyName" :value="address.companyName">
<input type="hidden" name="street" :value="address.street">
<input type="hidden" name="postcode" :value="address.postcode">
<input type="hidden" name="city" :value="address.city">
<input type="hidden" name="country" :value="address.country">
<input type="hidden" name="email" :value="address.email">

<input type="hidden" name="info" :value="newsletter">
<input type="hidden" name="donationReceipt" :value="receipt">

<input type="hidden" name="impCount" :value="trackingData.impressionCount">
<input type="hidden" name="bImpCount" :value="trackingData.bannerImpressionCount">
<input type="hidden" name="piwik_campaign" :value="campaignValues.campaign">
<input type="hidden" name="piwik_kwd" :value="campaignValues.keyword">

</span>
</template>

Expand All @@ -40,6 +45,7 @@ import { addressTypeName } from '@/view_models/AddressTypeModel';
import { BankAccount } from '@/view_models/BankAccount';
import { TrackingData } from '@/view_models/TrackingData';
import { CampaignValues } from '@/view_models/CampaignValues';
import addressType from '@/components/pages/membership_form/AddressType.vue';
export default Vue.extend( {
name: 'SubmitValues',
Expand All @@ -48,6 +54,9 @@ export default Vue.extend( {
campaignValues: Object as () => CampaignValues,
},
computed: {
addressType(): string {
return addressType.name;
},
...mapState<Payment>( NS_PAYMENT, {
payment: ( state: Payment ) => state.values,
} ),
Expand All @@ -60,6 +69,12 @@ export default Vue.extend( {
...mapState<BankAccount>( NS_BANKDATA, {
bankdata: ( state: BankAccount ) => state.values,
} ),
sendPostalAddress(): boolean {
return this.addressType !== 'anonym' && this.addressType !== 'email';
},
sendNameAndEmail(): boolean {
return this.addressType !== 'anonym';
},
newsletter(): string {
return this.$store.getters[ NS_ADDRESS + '/willGetNewsletter' ] ? '1' : '0';
},
Expand Down
100 changes: 82 additions & 18 deletions tests/unit/components/pages/donation_form/SubmitValues.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { AddressTypeModel, addressTypeName } from '@/view_models/AddressTypeMode
const localVue = createLocalVue();
localVue.use( Vuex );

const getWrapper = () => {
return mount( SubmitValues, {
const getWrapper = ( addressType: AddressTypeModel ) => {
return mount(SubmitValues, {
localVue,
propsData: {
trackingData: {
Expand All @@ -20,12 +20,12 @@ const getWrapper = () => {
keyword: 'cage',
},
},
store: new Vuex.Store( {
store: new Vuex.Store({
modules: {
[ NS_ADDRESS ]: {
namespaced: true,
state: {
addressType: AddressTypeModel.PERSON,
addressType: addressType,
values: {
firstName: 'Victor',
lastName: 'van Doom',
Expand Down Expand Up @@ -63,37 +63,101 @@ const getWrapper = () => {
},
},
},
} ),
} );
}),
});
};

describe( 'SubmitValues.vue', () => {
it( 'renders input fields', () => {
const wrapper = getWrapper();
it( 'renders input fields for ANON address type', () => {
const wrapper = getWrapper( AddressTypeModel.ANON );
expect( wrapper.element ).toMatchSnapshot();
} );

it( 'renders the amount as an integer', () => {
const wrapper = getWrapper();
it( 'renders input fields for EMAIL address type', () => {
const wrapper = getWrapper( AddressTypeModel.EMAIL );
expect( wrapper.element ).toMatchSnapshot();
} );

it( 'renders input fields for PERSON address type', () => {
const wrapper = getWrapper( AddressTypeModel.PERSON );
expect( wrapper.element ).toMatchSnapshot();
} );

it( 'renders the amount as an integer for ANON address type', () => {
const wrapper = getWrapper( AddressTypeModel.ANON );
expect( ( wrapper.find( 'input[name=amount]' ).element as HTMLInputElement ).value ).toBe( '2349' );
} );

it( 'renders the address type as string', () => {
const wrapper = getWrapper();
expect( ( wrapper.find( 'input[name=addressType]' ).element as HTMLInputElement ).value ).toBe( addressTypeName( AddressTypeModel.PERSON ) );
it( 'renders the amount as an integer for EMAIL address type', () => {
const wrapper = getWrapper( AddressTypeModel.EMAIL );
expect( ( wrapper.find( 'input[name=amount]' ).element as HTMLInputElement ).value ).toBe( '2349' );
} );

it( 'renders the amount as an integer for PERSON address type', () => {
const wrapper = getWrapper( AddressTypeModel.PERSON );
expect( ( wrapper.find( 'input[name=amount]' ).element as HTMLInputElement ).value ).toBe( '2349' );
} );

it( 'renders the address type as string for ANON address type', () => {
const wrapper = getWrapper( AddressTypeModel.ANON );
expect( ( wrapper.find('input[name=addressType]' ).element as HTMLInputElement ).value ).toBe(
addressTypeName( AddressTypeModel.ANON )
);
} );

it( 'renders the address type as string for EMAIL address type', () => {
const wrapper = getWrapper( AddressTypeModel.EMAIL );
expect( ( wrapper.find( 'input[name=addressType]' ).element as HTMLInputElement ).value ).toBe(
addressTypeName( AddressTypeModel.EMAIL )
);
} );

it( 'renders the address type as string for PERSON address type', () => {
const wrapper = getWrapper( AddressTypeModel.PERSON );
expect( ( wrapper.find( 'input[name=addressType]' ).element as HTMLInputElement ).value ).toBe(
addressTypeName( AddressTypeModel.PERSON )
);
} );

it( 'sends tracking values', () => {
const wrapper = getWrapper();
it( 'sends tracking values for ANON address type', () => {
const wrapper = getWrapper( AddressTypeModel.ANON );

expect( ( wrapper.find( 'input[name=bImpCount]' ).element as HTMLInputElement ).value ).toBe( '1' );
expect( ( wrapper.find( 'input[name=impCount]' ).element as HTMLInputElement ).value ).toBe( '5' );
} );

it( 'sends campaign values', () => {
const wrapper = getWrapper();
it( 'sends tracking values for EMAIL address type', () => {
const wrapper = getWrapper( AddressTypeModel.EMAIL );

expect( ( wrapper.find( 'input[name=bImpCount]' ).element as HTMLInputElement ).value ).toBe( '1' );
expect( (wrapper.find( 'input[name=impCount]' ).element as HTMLInputElement ).value ).toBe( '5' );
} );

it( 'sends tracking values for PERSON address type', () => {
const wrapper = getWrapper( AddressTypeModel.PERSON );

expect( ( wrapper.find( 'input[name=bImpCount]' ).element as HTMLInputElement ).value ).toBe( '1' );
expect( ( wrapper.find( 'input[name=impCount]' ).element as HTMLInputElement ).value ).toBe( '5' );
} );

it( 'sends campaign values for ANON address type', () => {
const wrapper = getWrapper( AddressTypeModel.ANON );

expect( ( wrapper.find( 'input[name=piwik_campaign]' ).element as HTMLInputElement ).value).toBe( 'nicholas' );
expect( ( wrapper.find( 'input[name=piwik_kwd]' ).element as HTMLInputElement ).value).toBe( 'cage' );
} );

it( 'sends campaign values for EMAIL address type', () => {
const wrapper = getWrapper( AddressTypeModel.EMAIL );

expect( ( wrapper.find( 'input[name=piwik_campaign]' ).element as HTMLInputElement ).value ).toBe( 'nicholas' );
expect( ( wrapper.find( 'input[name=piwik_kwd]' ).element as HTMLInputElement ).value ).toBe( 'cage' );
} );

it( 'sends campaign values for PERSON address type', () => {
const wrapper = getWrapper( AddressTypeModel.PERSON );

expect( ( wrapper.find( 'input[name=piwik_campaign]' ).element as HTMLInputElement ).value ).toBe( 'nicholas' );
expect( ( wrapper.find( 'input[name=piwik_kwd]' ).element as HTMLInputElement ).value ).toBe( 'cage' );
} );
} );
} );

0 comments on commit d46402c

Please sign in to comment.