Commit83337c9

committed

sigmavirus24gh-543 Update regex to include hyphens in username

Fix bug where a username which contains a hyphen cannot be used in the `GitHub.pubsubhubbub` method.

1 parent5c85bd1 commit83337c9Copy full SHA for 83337c9

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -998,7 +998,8 @@ def pubsubhubbub(self, mode, topic, callback, secret=''):`
`998`	`998`	`:returns: bool`
`999`	`999`	`"""`
`1000`	`1000`	`fromreimportmatch`
`1001`		`-m=match('https?://[\w\d\-\.\:]+/\w+/[\w\._-]+/events/\w+',topic)`
	`1001`	`+m=match('https?://[\w\d\-\.\:]+/\w[\w-]+\w/[\w\._-]+/events/\w+',`
	`1002`	`+topic)`
`1002`	`1003`	`status=False`
`1003`	`1004`	`ifmodeandtopicandcallbackandm:`
`1004`	`1005`	`data= [('hub.mode',mode), ('hub.topic',topic),`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -416,6 +416,32 @@ def test_pubsubhubbub(self):`
`416`	`416`	`}`
`417`	`417`	`)`
`418`	`418`
	`419`	`+deftest_pubsubhubbub_invalid_username(self):`
	`420`	`+"""Verify a valid call with invalid username does not call post."""`
	`421`	`+topic= (`
	`422`	`+'hub.topic',`
	`423`	`+'https://github.com/-octocat/hello-world/events/push'`
	`424`	`+ )`
	`425`	`+body= [('hub.mode','subscribe'),`
	`426`	`+topic,`
	`427`	`+ ('hub.callback','https://localhost/post')]`
	`428`	`+data=dict([(k[4:],v)fork,vinbody])`
	`429`	`+self.instance.pubsubhubbub(**data)`
	`430`	`+assertself.session.post.calledisFalse`
	`431`	`+`
	`432`	`+deftest_pubsubhubbub_valid_username(self):`
	`433`	`+"""Verify a valid call with valid username calls post."""`
	`434`	`+topic= (`
	`435`	`+'hub.topic',`
	`436`	`+'https://github.com/o-cto-ca-t/hello-world/events/push'`
	`437`	`+ )`
	`438`	`+body= [('hub.mode','subscribe'),`
	`439`	`+topic,`
	`440`	`+ ('hub.callback','https://localhost/post')]`
	`441`	`+data=dict([(k[4:],v)fork,vinbody])`
	`442`	`+self.instance.pubsubhubbub(**data)`
	`443`	`+assertself.session.post.calledisTrue`
	`444`	`+`
`419`	`445`	`deftest_pubsubhubbub_secret(self):`
`420`	`446`	`"""Verify the request for creating a pubsubhubbub hook."""`
`421`	`447`	`topic= (`

Comments

(0)