Stephen Birarda
|
72dd26acbe
|
only require OAuth authentication with a list of allowed roles
|
2014-05-02 10:47:59 -07:00 |
|
Stephen Birarda
|
aa2931d9bb
|
resolve conflicts on merge with upstream/master
|
2014-05-02 10:39:17 -07:00 |
|
Stephen Birarda
|
709bcdb148
|
handle interface client connection to DS with user roles
|
2014-05-01 16:18:07 -07:00 |
|
Stephen Birarda
|
b14d543701
|
retreive user profile and enumerate roles
|
2014-05-01 15:46:09 -07:00 |
|
Stephen Birarda
|
a49668031d
|
send a request for an access token after receiving auth code
|
2014-05-01 14:49:58 -07:00 |
|
Stephen Birarda
|
a826f3817b
|
fix assignment json for fulfilled assignments
|
2014-05-01 13:56:45 -07:00 |
|
Stephen Birarda
|
7a1aa7ec89
|
keep track of all assignments to stop double agents
|
2014-05-01 13:50:39 -07:00 |
|
Stephen Birarda
|
d942054015
|
cleanup re-display of OAuthWebView
|
2014-05-01 12:44:42 -07:00 |
|
Stephen Birarda
|
56c24ce8b7
|
present QWebView for OAuth authorization in interface
|
2014-05-01 11:09:35 -07:00 |
|
Stephen Birarda
|
2f0e311a99
|
return OAuth URL to interface clients when OAuth enabled
|
2014-05-01 10:19:05 -07:00 |
|
ZappoMan
|
aac42058ac
|
first cut at modelserver
|
2014-04-30 09:25:52 -07:00 |
|
Stephen Birarda
|
1c2032790a
|
allow passing of OAuth client secret to DS on command-line
|
2014-04-25 17:02:19 -07:00 |
|
Stephen Birarda
|
86f3cf2a75
|
allow passing of oauth info to DS
|
2014-04-25 16:39:45 -07:00 |
|
Stephen Birarda
|
e50e4d33be
|
Merge branch 'master' of https://github.com/highfidelity/hifi into oauth-ds
|
2014-04-25 16:10:55 -07:00 |
|
Atlante45
|
8b4a910040
|
Fix timestamp timer not fired
|
2014-04-25 12:19:18 -07:00 |
|
Stephen Birarda
|
c26fc7a838
|
pull OAuth code from URL in domain-server
|
2014-04-24 15:05:41 -07:00 |
|
Stephen Birarda
|
4a68c2e9c4
|
allow DS to handle incoming HTTPS requests
|
2014-04-24 14:58:08 -07:00 |
|
Stephen Birarda
|
96de0c1af1
|
setup the domain-server HTTPS server
|
2014-04-24 14:13:17 -07:00 |
|
Stephen Birarda
|
260966915a
|
add HTTPS versions of webserver classes
|
2014-04-24 14:06:24 -07:00 |
|
Clément Brisset
|
d441e6a453
|
Merge pull request #2717 from AndrewMeadows/inertia
avatar bounding capsule collision against voxels
|
2014-04-23 16:06:14 -07:00 |
|
Andrew Meadows
|
da5ac3d664
|
remove warning about signed/unsigned comparison
|
2014-04-23 08:47:25 -07:00 |
|
Atlante45
|
3eeb3a539d
|
Fixed lack of resolution in usecTimestampNow()
|
2014-04-22 11:48:43 -07:00 |
|
Stephen Birarda
|
07387a132e
|
fix broken DS build
|
2014-04-21 09:31:21 -07:00 |
|
Stephen Birarda
|
cc7d986398
|
don't make scripts statically assigned
|
2014-04-21 09:29:08 -07:00 |
|
Stephen Birarda
|
419e092858
|
rename matching static method in DS
|
2014-04-21 08:48:29 -07:00 |
|
Stephen Birarda
|
c9b0444310
|
correct re-assignment of static assignments
|
2014-04-21 08:47:14 -07:00 |
|
Stephen Birarda
|
c64ae35374
|
remove an extra bracket
|
2014-04-21 01:01:38 -07:00 |
|
Stephen Birarda
|
36b58b178c
|
have scripted assignments added via config be static
|
2014-04-21 01:00:56 -07:00 |
|
Stephen Birarda
|
e9768ca4fc
|
add missing pool handling to DS
|
2014-04-18 13:34:30 -07:00 |
|
Brad Hefta-Gaub
|
4fe2ec3950
|
Merge pull request #2686 from birarda/ds-script-preload
allow passing of preload scripts to DS on launch
|
2014-04-17 11:42:00 -07:00 |
|
Stephen Birarda
|
142932bed0
|
allow passing of scripted assignments to DS via parameters
|
2014-04-17 10:14:11 -07:00 |
|
Stephen Birarda
|
67cc186964
|
optional sending of assignment pool from ds assignment page
|
2014-04-16 16:29:22 -07:00 |
|
Stephen Birarda
|
a25ef58247
|
move DTLS socket changes to LimitedNodeList
|
2014-04-16 11:25:35 -07:00 |
|
Stephen Birarda
|
55d540a0eb
|
fix a typo in DomainServer.cpp
|
2014-04-16 11:24:26 -07:00 |
|
Stephen Birarda
|
97e45e8fe5
|
re-instate connect behavior in DS so killed nodes re-connect, amend #2675
|
2014-04-16 10:56:33 -07:00 |
|
Stephen Birarda
|
2518d314ac
|
add ssize_t definition for gnutls.h include on Windows
|
2014-04-10 10:19:45 -07:00 |
|
Stephen Birarda
|
16bb28a4fa
|
make GnuTLS a system include to suppress warnings
|
2014-04-10 10:04:02 -07:00 |
|
Stephen Birarda
|
1d5644a85f
|
link GnuTLS to octree library
|
2014-04-10 09:45:57 -07:00 |
|
Stephen Birarda
|
d5d52f804f
|
add a networking library and link from appropriate targets
|
2014-04-10 09:32:17 -07:00 |
|
Stephen Birarda
|
1c861fbecb
|
resolve conflicts on merge with upstream master
|
2014-04-09 15:36:15 -07:00 |
|
Stephen Birarda
|
3fe5af1505
|
update boilerplate and include guards for other new files
|
2014-04-09 15:08:56 -07:00 |
|
Stephen Birarda
|
5a79079c09
|
fix boilerplates in new DTLS files
|
2014-04-09 15:03:56 -07:00 |
|
Stephen Birarda
|
ae4b8348a2
|
fix header include guards via regex
|
2014-04-09 12:03:17 -07:00 |
|
Stephen Birarda
|
6ce5a24460
|
missed copyright cleanups in apache header
|
2014-04-09 09:44:38 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Stephen Birarda
|
6a51df9e38
|
initial regex replacement of headers
|
2014-04-08 17:30:36 -07:00 |
|
Stephen Birarda
|
ea61ccff7f
|
add some more debugging when reading X509 cert files for DTLS
|
2014-04-08 14:10:04 -07:00 |
|
Stephen Birarda
|
e417e7670b
|
cleanup DomainServer debug during config parsing
|
2014-04-08 14:07:31 -07:00 |
|
Stephen Birarda
|
9ca864bb50
|
don't parse excluded types from config variant map
|
2014-04-08 14:05:26 -07:00 |
|
Stephen Birarda
|
9a9939c11a
|
repairs for assignment parsing from command line and JSON
|
2014-04-08 14:03:42 -07:00 |
|