Skip to content
This repository was archived by the owner on Jan 5, 2026. It is now read-only.

port: remove trusted URL logic #2938

Merged
joshgummersall merged 2 commits into from
Oct 22, 2020
Merged

port: remove trusted URL logic #2938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0df13f
Remove trusted URL logic
Oct 21, 2020
d9b0d1b
Merge branch 'main' into jpg/remove-trusted-service-url
stevengum Oct 22, 2020
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
2 changes: 0 additions & 2 deletions libraries/botbuilder/tests/botFrameworkAdapter.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1832,7 +1832,6 @@ describe(`BotFrameworkAdapter`, function () {
assert(context.activity.type === 'event', `request has invalid type.`);
assert(context.activity.from && context.activity.from.id === reference.user.id, `request has invalid from.id.`);
assert(context.activity.recipient && context.activity.recipient.id === reference.bot.id, `request has invalid recipient.id.`);
assert(!MicrosoftAppCredentials.isTrustedServiceUrl('https://example.org/channel'));
called = true;
}).then(() => {
assert(called, `bot logic not called.`);
Expand All @@ -1849,7 +1848,6 @@ describe(`BotFrameworkAdapter`, function () {
assert(context.activity.type === 'event', `request has invalid type.`);
assert(context.activity.from && context.activity.from.id === reference.user.id, `request has invalid from.id.`);
assert(context.activity.recipient && context.activity.recipient.id === reference.bot.id, `request has invalid recipient.id.`);
assert(MicrosoftAppCredentials.isTrustedServiceUrl('https://example.org/channel'));
called = true;
}).then(() => {
assert(called, `bot logic not called.`);
Expand Down
17 changes: 1 addition & 16 deletions libraries/botbuilder/tests/skills/skillHandler.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,24 +175,9 @@ describe('SkillHandler', function () {
describe('continueConversation()', () => {
const identity = new ClaimsIdentity([{ type: 'aud', value: 'audience' }]);
const conversationId = 'conversationId';
const serviceUrl = 'http://initiallyUntrusted/api/messages';

it(`should add the original activity's ServiceUrl to the TrustedServiceUrls in AppCredentials`, (done) => {
expectsGetSkillConversationReference(conversationId, serviceUrl);

assert(!AppCredentials.isTrustedServiceUrl(serviceUrl), 'service URL should initially be untrusted');

handler
.continueConversation(identity, conversationId, () => {
assert(AppCredentials.isTrustedServiceUrl(serviceUrl), 'service URL should now be trusted');
sandbox.verify();
done();
})
.catch(done);
});

it('should cache the ClaimsIdentity, ConnectorClient and SkillConversationReference on the turnState', (done) => {
expectsGetSkillConversationReference(conversationId, serviceUrl);
expectsGetSkillConversationReference(conversationId);

handler
.continueConversation(identity, conversationId, async (adapter, ref, context) => {
Expand Down
86 changes: 85 additions & 1 deletion libraries/botbuilder/tests/teamsInfo.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,19 @@ describe('TeamsInfo', () => {
done();
});

// Sets up nock expectation for an oauth token call, returning the expected auth header
// and the nock expectation
const nockOauth = () => {
const tokenType = 'Bearer';
const accessToken = 'access_token';

const expectation = nock('https://login.microsoftonline.com')
.post(/\/oauth2\/token/)
.reply(200, { access_token: accessToken, token_type: tokenType });

return { expectedAuthHeader: `${tokenType} ${accessToken}`, expectation };
};

describe('sendMessageToTeamsChannel()', () => {
it('should work with correct information', async () => {
const newConversation = [
Expand All @@ -166,16 +179,22 @@ describe('TeamsInfo', () => {
'resourceresponseid',
];

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchNewConversation = nock('https://smba.trafficmanager.net/amer')
.post('/v3/conversations')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, { newConversation });

const context = new TestContext(teamActivity);
const msg = MessageFactory.text('test message');
const teamChannelId = '19%3AgeneralChannelIdgeneralChannelId%40thread.skype';

const response = await TeamsInfo.sendMessageToTeamsChannel(context, msg, teamChannelId);

assert(fetchOauthToken.isDone());
assert(fetchNewConversation.isDone());

assert(Array.isArray(response));
assert(newConversation[0]['activityid'] == 'activityid123');
assert(newConversation[1] == 'resourceresponseid');
Expand Down Expand Up @@ -264,14 +283,19 @@ describe('TeamsInfo', () => {
},
];

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchChannelListExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/teams/19%3AgeneralChannelIdgeneralChannelId%40thread.skype/conversations')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, { conversations });

const context = new TestContext(teamActivity);
const channels = await TeamsInfo.getTeamChannels(context);

assert(fetchOauthToken.isDone());
assert(fetchChannelListExpectation.isDone());

assert(Array.isArray(channels));
assert(channels.length === 3, `unexpected number of channels detected: ${channels.length}`);

Expand All @@ -298,14 +322,19 @@ describe('TeamsInfo', () => {
},
];

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchChannelListExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/teams/19%3AChannelIdgeneralChannelId%40thread.skype/conversations')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, { conversations });

const context = new TestContext(teamActivity);
const channels = await TeamsInfo.getTeamChannels(context, '19:[email protected]');

assert(fetchOauthToken.isDone());
assert(fetchChannelListExpectation.isDone());

assert(Array.isArray(channels));
assert(channels.length === 3, `unexpected number of channels detected: ${channels.length}`);

Expand Down Expand Up @@ -350,14 +379,20 @@ describe('TeamsInfo', () => {
name: 'TeamName',
aadGroupId: 'Team-aadGroupId',
};

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchTeamDetailsExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/teams/19%3AgeneralChannelIdgeneralChannelId%40thread.skype')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, teamDetails);

const context = new TestContext(teamActivity);
const fetchedTeamDetails = await TeamsInfo.getTeamDetails(context);

assert(fetchOauthToken.isDone());
assert(fetchTeamDetailsExpectation.isDone());

assert(fetchedTeamDetails, `teamDetails should not be falsey: ${teamDetails}`);
assert(fetchedTeamDetails.id === '19:[email protected]');
assert(fetchedTeamDetails.name === 'TeamName');
Expand All @@ -370,8 +405,12 @@ describe('TeamsInfo', () => {
name: 'TeamName',
aadGroupId: 'Team-aadGroupId',
};

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchTeamDetailsExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/teams/19%3AChannelIdgeneralChannelId%40thread.skype')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, teamDetails);

const context = new TestContext(teamActivity);
Expand All @@ -380,7 +419,9 @@ describe('TeamsInfo', () => {
'19:[email protected]'
);

assert(fetchOauthToken.isDone());
assert(fetchTeamDetailsExpectation.isDone());

assert(fetchedTeamDetails, `teamDetails should not be falsey: ${teamDetails}`);
assert(fetchedTeamDetails.id === '19:[email protected]');
assert(fetchedTeamDetails.name === 'TeamName');
Expand All @@ -403,14 +444,19 @@ describe('TeamsInfo', () => {
},
];

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchChannelListExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/conversations/a%3AoneOnOneConversationId/members')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, members);

const context = new TestContext(oneOnOneActivity);
const fetchedMembers = await TeamsInfo.getMembers(context);

assert(fetchOauthToken.isDone());
assert(fetchChannelListExpectation.isDone());

assert.deepStrictEqual(
fetchedMembers,
members.map((member) => ({ ...member, aadObjectId: member.objectId }))
Expand Down Expand Up @@ -451,14 +497,19 @@ describe('TeamsInfo', () => {
},
];

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchChannelListExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/conversations/19%3AgroupChatId%40thread.v2/members')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, members);

const context = new TestContext(groupChatActivity);
const fetchedMembers = await TeamsInfo.getMembers(context);

assert(fetchOauthToken.isDone());
assert(fetchChannelListExpectation.isDone());

assert.deepStrictEqual(
fetchedMembers,
members.map((member) => ({ ...member, aadObjectId: member.objectId }))
Expand Down Expand Up @@ -489,13 +540,19 @@ describe('TeamsInfo', () => {
},
];

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchChannelListExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/conversations/19%3AgeneralChannelIdgeneralChannelId%40thread.skype/members')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, members);

const context = new TestContext(teamActivity);
const fetchedMembers = await TeamsInfo.getMembers(context);

assert(fetchOauthToken.isDone());
assert(fetchChannelListExpectation.isDone());

assert.deepStrictEqual(
fetchedMembers,
members.map((member) => ({ ...member, aadObjectId: member.objectId }))
Expand Down Expand Up @@ -528,13 +585,19 @@ describe('TeamsInfo', () => {
tenantId: 'tenantId-Guid',
};

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/conversations/a%3AoneOnOneConversationId/members/29%3AUser-One-Id')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, member);

const context = new TestContext(oneOnOneActivity);
const fetchedMember = await TeamsInfo.getMember(context, oneOnOneActivity.from.id);

assert(fetchOauthToken.isDone());
assert(fetchExpectation.isDone());

assert.deepStrictEqual(fetchedMember, member);
});

Expand All @@ -550,13 +613,19 @@ describe('TeamsInfo', () => {
tenantId: 'tenantId-Guid',
};

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/conversations/19%3AgeneralChannelIdgeneralChannelId%40thread.skype/members/29%3AUser-One-Id')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, member);

const context = new TestContext(teamActivity);
const fetchedMember = await TeamsInfo.getMember(context, teamActivity.from.id);

assert(fetchOauthToken.isDone());
assert(fetchExpectation.isDone());

assert.deepStrictEqual(fetchedMember, member);
});
});
Expand Down Expand Up @@ -597,13 +666,18 @@ describe('TeamsInfo', () => {
},
};

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v1/meetings/19%3AmeetingId/participants/User-aadObjectId?tenantId=tenantId-Guid')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, participant);

const fetchedParticipant = await TeamsInfo.getMeetingParticipant(context);

assert(fetchOauthToken.isDone());
assert(fetchExpectation.isDone());

assert.deepStrictEqual(fetchedParticipant, participant);
});

Expand Down Expand Up @@ -668,14 +742,19 @@ describe('TeamsInfo', () => {
},
];

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchChannelListExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/conversations/19%3AgeneralChannelIdgeneralChannelId%40thread.skype/members')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, members);

const context = new TestContext(teamActivity);
const fetchedMembers = await TeamsInfo.getTeamMembers(context);

assert(fetchOauthToken.isDone());
assert(fetchChannelListExpectation.isDone());

assert.deepStrictEqual(
fetchedMembers,
members.map((member) => ({ ...member, aadObjectId: member.objectId }))
Expand Down Expand Up @@ -706,14 +785,19 @@ describe('TeamsInfo', () => {
},
];

const { expectedAuthHeader, expectation: fetchOauthToken } = nockOauth();

const fetchChannelListExpectation = nock('https://smba.trafficmanager.net/amer')
.get('/v3/conversations/19%3AChannelIdgeneralChannelId%40thread.skype/members')
.matchHeader('Authorization', expectedAuthHeader)
.reply(200, members);

const context = new TestContext(teamActivity);
const fetchedMembers = await TeamsInfo.getTeamMembers(context, '19:[email protected]');

assert(fetchOauthToken.isDone());
assert(fetchChannelListExpectation.isDone());

assert.deepStrictEqual(
fetchedMembers,
members.map((member) => ({ ...member, aadObjectId: member.objectId }))
Expand Down Expand Up @@ -815,7 +899,7 @@ describe('TeamsInfo', () => {
tenantId: 'tenantId-Guid',
},
];
const conversations = new Conversations({ id: 'convo1', id: 'convo2' });
const conversations = new Conversations({ id: 'convo1' });
const getPagedMembers = sandbox.stub(conversations, 'getConversationPagedMembers');
getPagedMembers.returns({ continuationToken: 'token', members: members });
const connector = new ConnectorClient(new MicrosoftAppCredentials('', ''));
Expand Down
Loading