Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
87332 commits 2 branches 0 tags 1.1 GiB
Commit graph

1580 commits

Author SHA1 Message Date
Ryan Huffman
1bb778c21f Fix label support in DS settings and add automatic domain generation: 2017-10-27 11:49:41 -07:00
Ryan Huffman
92aa66cdd7 Update domain settings to include domain info editing 2017-10-27 11:49:40 -07:00
Ryan Huffman
7dc475c695 Update domain server settings 
Move requests that require access token to go through DS
Update various styling and ease of use on DS settings page

Update domain server settings

CP

CP
 2017-10-27 11:49:34 -07:00
Stephen Birarda
10d05ba6c9 only respond to expected ICE peers in DS 2017-10-26 16:34:49 -07:00
Stephen Birarda
9345f4545f sanitize the ice-server addresses before using 2017-10-25 14:10:11 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
Stephen Birarda
57a92adc73 flag node as local by sending address, not by local from packet 2017-09-18 15:39:51 -07:00
Brad Hefta-Gaub
7cce45017b Merge pull request #11244 from birarda/bug/ice-dns-fail 
add a timeout for ICE server DNS lookup
 2017-09-07 11:09:05 -07:00
Stephen Birarda
3003f64514 add debug for ice server lookup fail 2017-08-24 16:42:53 -07:00
Stephen Birarda
c7affea411 add a timeout for ICE server DNS lookup 2017-08-24 16:40:16 -07:00
Stephen Birarda
133b7e66b7 adjust a comment and remove some debug 2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc add additional IP check to DS packet filter operator 2017-08-23 15:32:25 -07:00
Liv
b63fcc329e localhost default can change settings 2017-08-07 17:28:49 -07:00
Liv
d2abc42e8f Update domain server to include permissions 2017-08-07 12:43:54 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Liv
eb1b7e52df restore original files that had erroneous whitespace changes to reduce diff 2017-07-26 09:00:51 -07:00
Stephen Birarda
dd3755596c fix typo in comment in DomainGatekeeper header 2017-07-25 15:43:34 -07:00
Stephen Birarda
e9845784d5 don't return error decrypting for optimistic public keys 2017-07-25 15:28:05 -07:00
Stephen Birarda
2d0c5ff37a remove preloading of allowed user keys since it happens on connect 2017-07-25 11:41:34 -07:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
utkarshgautamnyu
5771ee27e1 Update DomainGatekeeper.cpp 2017-07-24 17:33:01 -07:00
utkarshgautamnyu
884bdb3b7e Update DomainGatekeeper.cpp 2017-07-24 14:57:22 -07:00
utkarshgautamnyu
7c62ed6dac made sendRequest depend on hasValidAccessToken being true 2017-07-24 14:46:32 -07:00
Liv
4ba9b08125 first attempt at url handling in octree server 2017-07-20 14:00:51 -07:00
Liv
e0fd391766 Add permission level for replacing domain content 2017-07-18 14:34:22 -07:00
Stephen Birarda
d22b146370 Merge pull request #10845 from birarda/bug/domain-cookie-restart 
fix for OAuth OPTIONS firing every XHR 302
 2017-07-06 17:22:03 -07:00
Stephen Birarda
6d98d20b12 cleanup bad QEventLoop::exec() OAuth handling code 2017-07-06 16:19:47 -07:00
utkarshgautamnyu
d961a0c4ad Merge pull request #10887 from highfidelity/bug/5950 
Bug/5950
 2017-07-06 14:04:38 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only 
disable user activity logger in DS/AC/ac-client
 2017-07-06 14:01:49 -07:00
utkarshgautamnyu
d5c88bc6de Merge branch 'master' into bug/5950 2017-07-06 12:52:13 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
utkarshgautamnyu
9d2fe8da9c Update DomainServer.cpp 2017-07-05 18:02:44 -07:00
utkarshgautamnyu
8c96d00f14 Update DomainServerSettingsManager.cpp 2017-07-05 16:59:47 -07:00
utkarshgautamnyu
c069c13ebb Update DomainServerSettingsManager.cpp 2017-07-05 14:12:18 -07:00
utkarshgautamnyu
1385ef80a7 Update DomainServerSettingsManager.cpp 2017-07-05 13:56:40 -07:00
Clément Brisset
8744b8e58d Merge pull request #10859 from Atlante45/fix/ac-cleanup 
Fix AC cleanup
 2017-06-30 16:42:15 -07:00
Atlante45
5c731636b1 Sandbox restarts crashed processes 2017-06-29 12:13:52 -07:00
utkarshgautamnyu
5f123018a4 Update DomainMetadata.cpp 2017-06-29 10:38:33 -07:00
Stephen Birarda
cf92144748 fix for OAuth OPTIONS firing on XHR 302 2017-06-28 14:13:09 -07:00
Stephen Birarda
86eb5b14ca disable the user activity logger in DS/AC/ac-client 2017-06-28 13:19:58 -07:00
Seth Alves
8510b60a87 Merge pull request #10789 from sethalves/fix-domain-server-ice-messages 
fix the messages printed by domain-server about which name it's using to find ice-servers
 2017-06-22 17:59:09 -07:00
Seth Alves
f1c7d54010 fix the messages printed by domain-server about which name it's using to find ice-servers 2017-06-22 13:53:06 -07:00
Stephen Birarda
0c7baa3ce4 remove an extra blank line 2017-06-22 13:36:58 -07:00
Stephen Birarda
dd44a81791 verify that replication server type is also present 2017-06-22 13:36:24 -07:00
Stephen Birarda
ea45e341ee send upstream nodes down to avatar/audio 2017-06-22 13:33:57 -07:00
seefo
48b5989b60 add upstream nodes to domain nodelist 2017-06-22 13:33:57 -07:00
Stephen Birarda
01d9812247 Merge pull request #10772 from birarda/bug/domain-double-connect 
use existing node ID during repeated connect requests
 2017-06-22 13:16:33 -07:00
Stephen Birarda
c516dd06e4 Merge pull request #10714 from highfidelity/replicants 
add broadcasting/replication to downstream avatar mixers and audio mixers
 2017-06-21 17:55:07 -07:00
Stephen Birarda
e39e5c8c3b simplify lambda capture in gate keeper 2017-06-21 16:21:40 -07:00
Stephen Birarda
aeb3f443f8 address code review comments 2017-06-21 16:14:14 -07:00
Stephen Birarda
9285c88e46 check if usernames do not match before using hint ID 2017-06-21 15:34:43 -07:00
Stephen Birarda
3e97b07fc2 Revert "force domain-server to use new ID if node requests connect" 
This reverts commit cd023e0384.
 2017-06-21 15:14:16 -07:00
seefo
0c7f1cda0f Added a restart button to domain server settings page 2017-06-19 15:01:50 -07:00
Stephen Birarda
ea6a38148c Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-15 14:30:08 -07:00
Ryan Huffman
330a27b3a0 Fix removing all downstream nodes in settings not killing nodes 2017-06-15 14:27:01 -07:00
Stephen Birarda
94abfc2d6b nomenclature changes from replication to broadcast 2017-06-15 11:47:13 -07:00
Stephen Birarda
10649c8f6e change new Node flag to isForcedNeverSilent 2017-06-14 17:20:37 -07:00
Stephen Birarda
224a559602 keep downstream nodes around in domain, alive in upstream 2017-06-14 17:17:14 -07:00
Stephen Birarda
1ed0b693da Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f Move downstram server adding to DS 2017-06-14 16:54:04 -07:00
Stephen Birarda
e818a511b9 cleanup debug in updateReplicatedNodes 2017-06-14 15:07:48 -07:00
Stephen Birarda
54832d995d fix a typo in shouldReplicateNode 2017-06-14 15:05:58 -07:00
Ryan Huffman
67113330b3 Make replicated username list case insensitive 2017-06-14 15:03:54 -07:00
Ryan Huffman
8d5dc21de8 Fix replicated nodes not being properly updated when logging in or changing settings 2017-06-14 15:03:53 -07:00
Ryan Huffman
7f75a5f7f5 Make replicated username list case insensitive 2017-06-14 13:57:04 -07:00
Ryan Huffman
59a420a358 Fix replicated nodes not being properly updated when logging in or changing settings 2017-06-14 13:53:50 -07:00
Ryan Huffman
029e6de2a0 Fix replicated users not being checked after username verified 2017-06-13 17:18:29 -07:00
Ryan Huffman
2e23230e82 Remove DomainServer qualification inside header 2017-06-13 17:18:29 -07:00
Ryan Huffman
ea56c568a7 Add support for replicating by username 2017-06-13 17:18:28 -07:00
Ryan Huffman
84e1a6f893 Rename isReplicant to isReplicated 2017-06-12 13:38:58 -07:00
Ryan Huffman
ff2800e8d5 Add isReplicant to Node 2017-06-12 13:37:49 -07:00
seefo
8a8f971186 empty passwords will no longer allow any password to pass DS HTTP auth 2017-05-23 12:01:00 -07:00
Stephen Birarda
9bc0609b1e address code review comments 2017-04-28 10:17:48 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
Stephen Birarda
cd023e0384 force domain-server to use new ID if node requests connect 2017-04-25 13:10:54 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Brad Davis
4367e3d036 PR comments 2017-03-15 18:13:10 -07:00
Brad Davis
2837ae9183 More VS 2017/2015 fixes 2017-03-15 16:13:15 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
David Kelly
a8831e89ff Ban only by machine fingerprint, when possible 2017-02-16 09:50:56 -07:00
Howard Stearns
34a4770ffa Merge pull request #9669 from davidkelly/dk/2656 
inform gatekeeper immediately when kicking someone
 2017-02-15 15:13:10 -08:00
Stephen Birarda
27412080dd return an empty descriptors map when empty 2017-02-14 15:39:59 -08:00
David Kelly
3b344ca01a inform gatekeeper immediately when kicking someone 2017-02-13 18:25:00 -07:00
David Kelly
45cb11f38a Don't allow a ban of any node on same machine as domain-server 2017-02-13 14:38:21 -07:00
Stephen Birarda
4bbd823a5a remove open hours from domain settings 2017-02-06 10:50:59 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Stephen Birarda
9b8cbba53f add isInInterestSet to DomainServer for extra checks 2017-01-24 18:32:33 -08:00
Stephen Birarda
e511b6e84c cleanup connect check in DomainServer 2017-01-24 17:14:05 -08:00
Stephen Birarda
fc42c1bc94 don't tell ESS about script Agents that won't talk to it 2017-01-24 17:10:05 -08:00
Stephen Birarda
1802e1520d change some dynamic_cast to static_cast for DomainServerNodeData 2017-01-23 13:15:48 -08:00
Stephen Birarda
fb8d2e34fb fix needless reinterpret_cast for DomainServerNodeData 2017-01-23 13:14:53 -08:00
Ryan Huffman
b6893a0100 Keep Agents and EntityScriptServers from connecting if lacking permissions 2017-01-19 14:35:27 -08:00
Zach Fox
44eaa64a1d It was writeString() all along! 2017-01-19 11:25:17 -08:00
Zach Fox
534fcd9399 Potential fix 2017-01-19 10:20:36 -08:00
Zach Fox
1175752e1d Cleanup after rebase 2017-01-18 12:55:24 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
Atlante45
529286b2ea More EntityScriptServer work 2017-01-17 13:47:45 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
Zach Fox
e22c1ac30e Fix the bug 2017-01-16 11:48:51 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS 
Adding Machine Fingerprint to Domain Server permissions
 2016-12-19 11:49:33 -08:00
Zach Fox
4bfc04a6ec Small CR changes 2016-12-19 10:41:18 -08:00
Zach Fox
ee2f600d2e Fix username display bug 2016-12-19 10:20:08 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
David Kelly
0553dbdcb7 CR feedback 2016-12-16 17:17:10 -08:00
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in 
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
 2016-12-14 16:09:13 -08:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Stephen Birarda
dec4ce79b2 fix comment in mac permission unpack 2016-11-18 14:42:29 -08:00
Stephen Birarda
143225a74c add MAC permission table to domain-server and leverage 2016-11-18 14:40:22 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
Stephen Birarda
39afb24982 explictly remove Agent from NIS for other Agents 2016-11-15 10:37:19 -08:00
Stephen Birarda
1791a1c1fe never send agents to other agents 2016-11-15 10:15:17 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
Ryan Huffman
528b8e93f0 Remove extraneous logging in DomainServer for whitelist 2016-11-11 14:33:34 -08:00
Ryan Huffman
fc1a7255f6 Remove unneeded 'this->' 2016-11-11 14:24:28 -08:00
Ryan Huffman
e177004d71 Fix ds not restarting when changing ac whitelist 2016-11-11 14:23:16 -08:00
Ryan Huffman
d522d03bd2 Add repeated message suppression to request assignment packets 2016-11-11 11:29:52 -08:00
David Kelly
96f6cb7ae4 whitespace 2016-11-11 11:24:06 -08:00
Ryan Huffman
bd1bcaf1a4 Clean up subnet whitelist implementation 2016-11-11 10:38:56 -08:00
Ryan Huffman
d691aa3302 Update naming for subnet whitelist in ds 2016-11-11 10:32:45 -08:00
Ryan Huffman
ca6a74d63d Add whitelist filtering to assignment requests 2016-11-11 10:19:53 -08:00
Ryan Huffman
63cfbf55ca Add ip address whitelist processing to domain server 2016-11-11 10:19:21 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer 
since we can get the canKick there too.  (doh)
 2016-11-11 09:30:58 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -08:00
Atlante45
ae29fe8ab2 Logging improvements 2016-11-04 14:26:19 -07:00
humbletim
bf93483f87 allow assignment client scripts to create ATP assets 2016-10-26 11:22:33 -04:00
Stephen Birarda
5562d7e7a6 add a filter operator to decide if connections are created 2016-10-14 14:46:58 -07:00
Ryan Downe Karpf
397816679d Merge pull request #8790 from huffman/feat/reliable-path-queries 
Update ds path queries to be reliable
 2016-10-13 09:21:44 -07:00
Ryan Huffman
a44653db57 Update ds path queries to be reliable 2016-10-12 10:47:42 -07:00
Atlante45
5bae69bb51 Fix DS 2016-10-12 10:20:19 -07:00
Atlante45
d5429e76da Warnings fixes and cleanup 2016-10-12 10:20:19 -07:00
Atlante45
eaca3b672f Switch to JSON for application settings 2016-10-12 10:20:19 -07:00
Seth Alves
e9961110e9 if we have new ice-server information, retry right away, even if the previous attempt failed 2016-10-10 15:40:59 -07:00
Seth Alves
9712301172 avoid a race that can cause metaverse to not have correct ice-server information about a domain 2016-10-10 11:54:33 -07:00
Brad Hefta-Gaub
41e90eda49 Merge pull request #8648 from sethalves/no-groups-no-log-spam 
don't check for user membership in a null list of groups
 2016-09-30 11:23:30 -07:00
Thijs Wenker
7e3073e163 fix spelling bugs 2016-09-29 22:13:27 +02:00
Seth Alves
8cadd299a2 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1 2016-09-23 13:16:26 -07:00
Seth Alves
f546524c1f don't checkout for user membership in a null list of groups 2016-09-23 09:46:10 -07:00
Seth Alves
bd2ee56a27 fix domain-server command-line arguments 2016-09-22 12:45:49 -07:00
Seth Alves
d2c5378627 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1 2016-09-22 11:44:23 -07:00
Seth Alves
c43c83019d Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-22 10:34:25 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Seth Alves
7dc8a48dba Merge branch 'ice-troubles' of github.com:sethalves/hifi into ice-troubles-1 2016-09-21 10:08:17 -07:00
Seth Alves
b9ea93de57 use qWarning rather than qCritical because qCritical may exit 2016-09-21 10:08:02 -07:00
Seth Alves
a3aea774fe tell metaverse ice-server is 0.0.0.0 when domain-server doesn't have one 2016-09-21 10:07:12 -07:00
Seth Alves
ba8aa5b50c fix camelcase 2016-09-19 16:38:34 -07:00
Seth Alves
571aaac4d7 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-19 15:37:53 -07:00
Seth Alves
8108557e10 whitespace 2016-09-19 15:37:50 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00
Seth Alves
45b48c01bf command-line arguments to control ice-server ip address and domain-server ID 2016-09-19 13:39:42 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Stephen Birarda
43b8e01d46 don't force auto networking on non metaverse domains 2016-08-23 11:21:15 -07:00
Stephen Birarda
d098a1ae28 allow temporary domains to use an access token when present 2016-08-22 10:50:39 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
Seth Alves
ac4ecc9907 don't send a login-denied packet when we're still waiting for user's public key. 2016-08-19 14:10:27 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Stephen Birarda
5bac88c004 default domain-server permissions to connect for standard 2016-08-11 10:52:36 -07:00
Zander Otavka
3df8aa0dba Suppress repeated ice server connection messages 2016-08-08 17:01:32 -07:00
Brad Hefta-Gaub
652bea8cd0 Merge pull request #8363 from birarda/no-temp-ice-update 
Avoid DS heartbeats with non-metaverse domain ID
 2016-08-05 16:48:00 -07:00
Seth Alves
3ca1ee1d82 Fix some group-related code to handle CamelCase usernames 2016-08-04 17:39:41 -07:00
Stephen Birarda
f3e30221f0 only force a new temp name if already a temp domain-server 2016-08-04 09:33:31 -07:00
Stephen Birarda
ba49fd2c61 don't heartbeat immediately unless metaverse domain 2016-08-04 09:33:31 -07:00
Stephen Birarda
a1220b87f1 set key ID for verified user in right place 2016-08-02 14:35:51 -07:00
Stephen Birarda
760223a550 check for existing public key with lowercase username 2016-08-02 14:35:51 -07:00
Stephen Birarda
5eb890e4f5 add a simple IP address sanitizer for DS settings save 2016-08-02 14:35:51 -07:00
Stephen Birarda
39e6ac0974 cleanup API for HifiConfigVariantMap after migration 2016-08-02 14:35:11 -07:00
Stephen Birarda
62af203d08 migrate the deprecated merged master/user config 2016-08-02 14:35:11 -07:00
Stephen Birarda
285478f1b2 don't repack the same permissions after kick 2016-08-02 14:35:11 -07:00
Stephen Birarda
5b04ab6d53 add node kick request handling to DS 2016-08-02 14:35:11 -07:00
Stephen Birarda
eaf52ae111 default kick perms for localhost 2016-08-02 14:35:11 -07:00
Stephen Birarda
5d69c9c81e fix sockaddr choice for local nodes 2016-08-02 14:35:11 -07:00
Stephen Birarda
b1e0e6d708 use replacement for IP address perms, not additive 2016-08-02 14:35:11 -07:00
Stephen Birarda
f7298ef767 add packing of IP perms, small cleanup in packing 2016-08-02 14:35:11 -07:00
Stephen Birarda
cd436355fc cleanup handling of defaults for standard user perms 2016-08-02 14:35:11 -07:00
Stephen Birarda
a674c843c2 add unpack for IP, DRYup unpackPermissions 2016-08-02 14:35:11 -07:00
Seth Alves
60d6673950 switch data-web urls to point at production server rather than dev one 2016-08-01 12:00:08 -07:00
Seth Alves
c72cfb165c damnit 2016-07-29 18:33:06 -07:00
Seth Alves
2443166d78 update for new friends api 2016-07-29 16:41:17 -07:00
Seth Alves
ebdfede89f switch to new friends api 2016-07-29 16:34:59 -07:00
Seth Alves
8e1820f911 make sure permissions have the correct ID in the case where a user has been verified 2016-07-29 13:10:14 -07:00
Seth Alves
390ee9aaeb clean up some code, add some debugging prints 2016-07-27 14:03:32 -07:00
Seth Alves
3a3b1489c6 code review 2016-07-27 11:46:52 -07:00
Seth Alves
8663b260f6 code review -- applyPermissionsForUser to setPermissionsForUser, don't take input permissions as an argument 2016-07-27 10:14:18 -07:00
Seth Alves
d69d5bff28 remove redundant call to userPerms.setVerifiedUserName 2016-07-27 10:06:02 -07:00
Seth Alves
a2d35df34e fix a couple of mistakes made during code-review response 2016-07-27 09:57:57 -07:00
Seth Alves
bc2ded2f97 code review 2016-07-27 08:46:46 -07:00
Seth Alves
148793011d code review 2016-07-27 07:55:09 -07:00
Seth Alves
f35b935031 do some cleaning-up of the domain-server settings page group tables 2016-07-22 17:51:31 -07:00
Seth Alves
82dfdebd46 move permissions for specific-users below groups. turn debug-prints back off 2016-07-22 14:14:03 -07:00
Seth Alves
8e5262872e fix bug that was losing verified status for users with permissions specific to their account 2016-07-22 14:00:46 -07:00
Seth Alves
6ec8aff645 remove group-related debug prints 2016-07-22 12:02:17 -07:00
Seth Alves
96fd1cb841 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-22 11:40:29 -07:00
Seth Alves
adba4cde0b book-keeping around groups and ranks 2016-07-22 11:40:23 -07:00
Seth Alves
97b40ab87d adapting to api changes 2016-07-21 14:04:55 -07:00
Howard Stearns
51bc3c51ca less logging, change constant name. 2016-07-21 08:35:21 -07:00
Seth Alves
c1b27a9249 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-20 10:03:22 -07:00
howard-stearns
98f76924c5 log hearbeat like we do updates 2016-07-18 14:49:56 -07:00
howard-stearns
1a66574adb add protocol version signature to metaverse heartbeat 2016-07-18 14:29:49 -07:00
Seth Alves
8e6b3ed8c2 rename variable to make its use more clear 2016-07-14 12:24:44 -07:00
Seth Alves
599b892296 refresh cached group information every 15 seconds 2016-07-14 11:20:57 -07:00
Seth Alves
0e86be8660 use dev metaverse 2016-07-13 14:48:23 -07:00
Seth Alves
02ce2468df Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-12 13:46:29 -07:00
Clément Brisset
2f07f0d24f Revert "Revert "Fix crash in packet list"" 2016-07-12 11:39:16 -07:00
Clément Brisset
d933238bda Revert "Fix crash in packet list" 2016-07-08 18:15:14 -07:00
Atlante45
97da515585 Assign random UUID to DS without one. 2016-07-08 15:15:58 -07:00
Seth Alves
55d76abf48 back-out accidently changed api urls 2016-07-06 16:42:31 -07:00
Seth Alves
e6f456f494 each rank in a group has its own permissions 2016-07-06 16:39:08 -07:00
Seth Alves
2a25f458fc fetch rank names from web api after getting a group's ID 2016-07-04 10:20:25 -07:00
Seth Alves
aae42e3802 updates to track zach's changes to api 2016-06-30 16:14:46 -07:00
Seth Alves
408a77dd13 merge from upstream 2016-06-29 18:49:33 -07:00
Stephen Birarda
1b87e902de fix initialization of DEFAULT_HOURS in DomainMetadata 2016-06-29 13:23:52 -07:00
Zach Pomerantz
80fceccb7e simplify hours parsing in domain metadata 2016-06-29 12:43:39 -07:00
Zach Pomerantz
c406538301 properly parse domain metadata hours 2016-06-28 12:40:25 -07:00
Zach Pomerantz
56038a97a6 add domain settings getter for descriptors, validates nested vals 2016-06-28 12:39:00 -07:00
Seth Alves
d4cc4bf1e4 represent node permissions as a bitfield rather than a list of bools 2016-06-27 14:55:13 -07:00
Seth Alves
c7d56493b1 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-27 10:07:38 -07:00
Seth Alves
ead6e476a9 add a list of blacklist groups which remove permissions rather than grant them 2016-06-24 14:03:43 -07:00
Brad Hefta-Gaub
cea4b27b4d Merge pull request #8128 from zzmp/feat/heartbeat-build-version 
add build version to heartbeat
 2016-06-24 12:20:16 -07:00
Seth Alves
cc1b6f0cb2 add a permissions-grid row for friends-of-domain-owner 2016-06-24 11:42:56 -07:00
Zach Pomerantz
1fcd7aa0c4 add build version to heartbeat 2016-06-23 19:55:16 -07:00
Zach Pomerantz
b1b378a91f add back access token to domain-server 2016-06-23 19:38:41 -07:00
Zach Pomerantz
13310923c4 reset to temp domain after logout 2016-06-23 19:38:23 -07:00
Seth Alves
c4b0f1899e merge from upstream 2016-06-23 13:26:01 -07:00
Zach Pomerantz
4a30d549ad force temp domain reset on 404 too (401 already) 2016-06-22 12:04:26 -07:00
Zach Pomerantz
a6115cba6e update temporary domains to use api_key 2016-06-22 12:04:26 -07:00
Zach Pomerantz
b6b73af2b4 Clean up domain-server setup 2016-06-22 12:02:35 -07:00
Zach Pomerantz
e03974181a reformat operating hours to [[open,close]] 2016-06-21 17:19:37 -07:00
Seth Alves
c97618f8bc reduce the number of user public-key downloads during a login attempt 2016-06-21 11:40:55 -07:00
Zach Pomerantz
52170eb12e use refs for domain metadata parsing 2016-06-21 11:21:20 -07:00
Seth Alves
f397c4760f comments 2016-06-21 09:56:39 -07:00
Zach Pomerantz
807596596f fix badging, parsing of operating hours 2016-06-21 00:18:38 -07:00
Zach Pomerantz
7fa7abdb1d add operating hours to domain-server settings/UI 2016-06-20 22:58:20 -07:00
Zach Pomerantz
4e0aeea2b8 add time offset to domain-server UI 2016-06-20 16:19:19 -07:00
Zach Pomerantz
cfe9ac32d4 fix narrowing warning by casting -1 2016-06-20 14:46:20 -07:00
Seth Alves
69f2f2e765 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-20 14:07:22 -07:00
Seth Alves
ba032ce0b4 apply a group's permissions to users who belong to the group 2016-06-20 14:06:09 -07:00
Seth Alves
fdafbd2015 apply a group's permissions to users who belong to the group 2016-06-20 14:02:23 -07:00
Seth Alves
82dd36459d apply a group's permissions to users who belong to the group 2016-06-20 14:02:04 -07:00
Zach Pomerantz
25b21dacda clean domain metadata and update acl 2016-06-20 13:44:14 -07:00
Zach Pomerantz
1c188a270d Merge pull request #8087 from zzmp/feat/send-domain-descriptors 
send domain metadata to metaverse for authed domains
 2016-06-20 11:22:01 -07:00
Seth Alves
764da926a3 merge sethalves:make-permissions-names-case-insensitive 2016-06-17 19:22:22 -07:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
Seth Alves
de100e8141 after receiving a group's ID from api, save it 2016-06-17 13:29:42 -07:00
Seth Alves
6fae35d9f2 start on handling group permissions 2016-06-16 16:42:15 -07:00
Seth Alves
dd24143d16 start on handling group permissions 2016-06-16 16:41:47 -07:00
Seth Alves
d184aade1b comments 2016-06-16 16:40:57 -07:00
Zach Pomerantz
1ce9e96cba Send domain metadata for authed domains 2016-06-16 13:00:28 -07:00
Seth Alves
e79767a121 authed username wasn't being saved in permissions, so that interface would get briefly disconnected when their permissions changed. 2016-06-11 15:16:02 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
Stephen Birarda
12e5851ba4 fix connection denial message, put version back 2016-06-09 15:53:19 -07:00
Stephen Birarda
f963adb5dd send connection denial for connect version mismatch 2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122 remove check in version downgrading from NodeList 2016-06-09 15:53:19 -07:00
Seth Alves
441b5a20d8 merge from upstream 2016-06-09 13:23:41 -07:00
Zach Pomerantz
9926c80917 Only check user metadata before sending 2016-06-08 18:45:01 -05:00
Seth Alves
8085266c1d cause names in permissions tables to be alpha-sorted 2016-06-08 10:36:44 -07:00
Seth Alves
7696ead012 look for standard permissions in standard table rather than in user table 2016-06-07 16:38:52 -07:00
Seth Alves
b2f63a2132 hook up can-rez-tmp and can-write-to-asset-server 2016-06-07 16:17:58 -07:00
Seth Alves
0c18df6278 don't restart domain-server if the only settings changes where permissions 2016-06-06 16:32:18 -07:00
Seth Alves
d202a2bf11 better handling of missing settings keys 2016-06-06 11:59:39 -07:00
Seth Alves
a4e4093a18 split permissions into two sets, one for 'standard' ones and one for specific users 2016-06-06 10:39:47 -07:00
Seth Alves
dd009bf8b9 add some debugging prints. make blacklisting work 2016-06-04 11:06:37 -07:00
Seth Alves
be403865fc don't request public keys for the standard psuedo-account-names 2016-06-04 10:44:59 -07:00
Seth Alves
80eeff5a64 bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided 2016-06-04 10:32:07 -07:00
Seth Alves
adf893ea19 rename AgentPermissions to NodePermissions 2016-06-04 09:50:36 -07:00
Seth Alves
09b0e3eaaf use constants rather than bare strings for standard psuedo-account-names 2016-06-04 09:07:34 -07:00
Zach Pomerantz
09e0a2ced7 Parse basic metadata into DomainMetadata 2016-06-03 15:13:09 -07:00
Zach Pomerantz
209ace1b86 Include anonymously connected user metadata 2016-06-03 15:00:43 -07:00
Zach Pomerantz
55e5c1f6e0 Declare metadata descriptors 2016-06-03 15:00:42 -07:00
Seth Alves
b88bba8672 add code to convert older domain-settings to current style 2016-06-03 13:15:53 -07:00
Zach Pomerantz
5c293646b9 Segment metadata users 2016-06-02 17:22:39 -07:00
Zach Pomerantz
85055d82bf Regenerate Domain metadata on user (dis)connect 2016-06-02 17:05:58 -07:00
Seth Alves
41a8e9fa91 missed a protocol change 2016-06-02 16:53:52 -07:00
Zach Pomerantz
b13e7a1a8f Encapsulate metadata in DomainMetadata 2016-06-02 16:04:27 -07:00
Seth Alves
fc92268641 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-02 15:38:24 -07:00
Zach Pomerantz
18696144f1 Move metadata generation to DomainMetadata 2016-06-02 15:36:29 -07:00
Zach Pomerantz
87e27d9570 Factor out metadata generation from heartbeat 2016-06-02 15:35:47 -07:00
Zach Pomerantz
bf920c2b80 Compact Domain heartbeat JSON 2016-06-02 15:34:36 -07:00
Seth Alves
d010dc9699 keep localhost line from being added every save. added some debugging print stuff 2016-06-02 15:08:16 -07:00
Seth Alves
83cba2dd82 start on code to convert from settings version 1.2 to 1.3 2016-06-02 13:28:36 -07:00
Seth Alves
83f2c723eb collect permissions into their own data structure 2016-06-02 13:15:30 -07:00
Seth Alves
ae0c8a96f2 code to unpack permissions into a usable data structure 2016-06-01 15:33:24 -07:00
Seth Alves
7810ed6313 working toward a permissions grid in domain-server settings 2016-05-31 16:56:08 -07:00
Zach Pomerantz
b280eebd03 Only count users against max capacity 2016-05-27 15:51:41 -07:00
Brad Hefta-Gaub
fb9f6185db CR feedback 2016-05-24 17:19:53 -07:00
Brad Hefta-Gaub
183f38e4f0 pop up warning if domain over capacity 2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Stephen Birarda
5ab876114f send hostname to DS with every DS packet to handle changes 2016-05-20 11:24:54 -07:00
Stephen Birarda
962066c7d1 send user hostname breakdown with heartbeat 2016-05-20 11:24:54 -07:00
Stephen Birarda
7d2d60f200 split assigned and un-assigned nodes 2016-05-20 11:24:54 -07:00
Stephen Birarda
5884e1eadd rename metaverse heartbeat methods 2016-05-20 11:24:54 -07:00
Stephen Birarda
3b2a9b7b98 fix set of place name on DomainServerNodeData 2016-05-20 11:24:54 -07:00
Stephen Birarda
7110fe98eb associate incoming place name with DomainServerNodeData 2016-05-20 11:24:54 -07:00
Ryan Huffman
79ce64aa3a Fix compilation error in DomainServer.cpp 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Stephen Birarda
84df6cfed0 only re-request ice addresses during failure 2016-04-14 14:46:08 -07:00
Stephen Birarda
3f0ffc0aff update ice-server address with API, add failed and clear denials 2016-04-14 10:33:17 -07:00
Stephen Birarda
55002b8d5e add ice server address to hearbeat if full networking is on 2016-04-14 09:27:43 -07:00
Stephen Birarda
ab414f65eb output success on first connection to new ice-server 2016-04-12 18:23:51 -07:00
Stephen Birarda
f69f59fa90 handle ice fail for no reply heartbeat in DS 2016-04-12 18:19:02 -07:00
Stephen Birarda
f1209dc82d fix index randomization for single candidate ice-server 2016-04-12 18:04:32 -07:00
Stephen Birarda
f975f480b4 use the random device for random number generation 2016-04-12 17:46:47 -07:00
Stephen Birarda
b5fe6120aa base randomization of ice-server from ice.highfidelity.com 2016-04-12 17:41:47 -07:00
Stephen Birarda
455d2d5048 allow for an empty password with a username 2016-04-12 09:37:26 -07:00
Stephen Birarda
a0edbac486 change comment for domain-server migration to SHA256 2016-04-05 14:12:50 -07:00
Stephen Birarda
7cd115f421 store and transmit passwords as SHA256 hash 2016-04-05 14:11:12 -07:00
Stephen Birarda
5054243655 compare HTTP auth password to base 64 settings value 2016-04-05 14:11:12 -07:00
Stephen Birarda
fd2ee8ce4e add migration of plaintext password to base64 2016-04-05 14:11:12 -07:00
Stephen Birarda
078872a6db correct returned OAuth redirect URL 2016-03-21 15:26:26 -07:00
Stephen Birarda
7f3761481c don't store UUIDs for cookies on disk 2016-03-21 15:22:32 -07:00
Stephen Birarda
510e8e89f2 fix a crash in DS with missing cert/key 2016-03-21 15:22:05 -07:00
Stephen Birarda
35973d4e30 re-use same socketed node for subsequent connections 2016-03-01 17:02:34 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Stephen Birarda
f1aca57543 remove a tab in whitespace only line 2016-02-24 16:30:34 -08:00
Stephen Birarda
f8392e62a8 some wording tweaks in comments 2016-02-23 17:43:01 -08:00
Stephen Birarda
0191d75e86 allow temporary domain to upload public key 2016-02-23 17:29:15 -08:00
Stephen Birarda
3a800350c9 re-set the ice heartbeat packet if keypair changes 2016-02-23 15:42:28 -08:00
Stephen Birarda
96ed19100b use ice-server heartbeat denial to trigger keypair re-gen 2016-02-23 15:26:13 -08:00
Stephen Birarda
4b4ea25ed6 immediately send ice heartbeat once keypair is ready 2016-02-23 11:24:26 -08:00
Stephen Birarda
83e8c248bd repairs to failure case for keypair generation 2016-02-23 11:20:21 -08:00
Stephen Birarda
e2f02347dd repairs to issues discovered during ID change 2016-02-23 10:57:54 -08:00
Stephen Birarda
d510ee0e47 complete ice-server signature verification 2016-02-22 18:00:05 -08:00
Stephen Birarda
9f9ef8764d add a note about the QDataStream black box 2016-02-22 15:32:59 -08:00
Stephen Birarda
11a1bc4488 add signed heartbeat sending to domain-server 2016-02-22 15:12:02 -08:00
Stephen Birarda
90e9089e85 repairs for storage of domain ID in AM accounts file 2016-02-22 13:23:01 -08:00
Stephen Birarda
e30b2b7051 generate new domain keypair on domain ID change 2016-02-22 10:28:32 -08:00
Stephen Birarda
837c4c0810 handle upload of domain public key to metaverse API 2016-02-19 16:55:12 -08:00
Stephen Birarda
fa5f2571d7 cleanup migrations from previous account file system 2016-02-19 16:31:31 -08:00
Stephen Birarda
98b06112bd handle persistence of AccountManager info to sep file 2016-02-19 15:45:20 -08:00
Stephen Birarda
af181e00b1 allow for creation of domain-server keypair in AccountManager 2016-02-19 14:34:19 -08:00
Brad Hefta-Gaub
c699c828cd Merge pull request #7092 from birarda/assets-abs-path 
add setting to DS for asset path, handle absolute paths
 2016-02-12 17:43:23 -08:00
Stephen Birarda
0f4467c582 cleanup exit codes for queued DS exit 2016-02-11 15:17:34 -08:00
Stephen Birarda
aaf8e60de3 delay critical quit messages until just prior to quit 2016-02-11 15:11:21 -08:00
Stephen Birarda
a089c43fdc don't send ice heartbeat with no ice-server socket 2016-02-11 14:07:05 -08:00
Ryan Huffman
811859e46f Update domain server to store temporary AC scripts in memory 2016-02-10 15:26:01 -08:00
James B. Pollack
3c9043987f Merge pull request #7019 from birarda/absolute-paths 
allow absolute path to entity-server persist file
 2016-02-04 08:53:21 -08:00
Stephen Birarda
9633e40c6e add code to remove old persistFilename setting 2016-02-02 15:15:19 -08:00
Stephen Birarda
13d58003be migrate persistFilename to persistFilePath in DS settings 2016-02-02 15:02:12 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
Atlante45
9330c3d4f3 Fix DS assignment scripts responses 2016-01-22 16:04:38 -08:00
Atlante45
822244ef72 Fix DS new assignment feature 2016-01-22 13:37:19 -08:00
Brad Hefta-Gaub
58b7708315 Merge pull request #6899 from birarda/fix-go-home 
repairs to index path behaviour
 2016-01-21 21:29:24 -08:00
Stephen Birarda
9061e33a1f send path query once connected to domain 2016-01-21 18:24:17 -08:00
Stephen Birarda
15c922f4a5 always respond with default index path 2016-01-21 18:24:16 -08:00
Atlante45
db18d188b8 Fix wifi ping spikes 
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
 2016-01-21 15:05:32 -08:00
Stephen Birarda
0d80e9dc1f setup ice heartbeat if auto networking enabled 2016-01-19 16:42:57 -08:00
Stephen Birarda
74b2a44050 merge the master and user configs after a settings change 2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e complete handling of immediate temp name grab 2016-01-19 13:04:05 -08:00
Stephen Birarda
a27d35566d stub of temporary name download on DS start 2016-01-19 10:49:18 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Ryan Huffman
a5eb54b1b7 Move DomainServer script location to app data directory 2016-01-15 10:36:09 -08:00
Ryan Huffman
4851def51c Add status HTTP server to AC Monitor 2016-01-08 10:35:04 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
Clément Brisset
5d75fcbfce Merge pull request #6430 from birarda/unique_linked_data 
use a unique_ptr for linkedData in Node
 2015-11-20 15:01:41 -08:00
Stephen Birarda
b34934b849 resolve conflicts on merge with upstream/master 2015-11-20 11:52:53 -08:00
Stephen Birarda
3b40119992 use Agent session UUID to request script 2015-11-20 11:35:24 -08:00
Stephen Birarda
271387f96e use a unique_ptr for linkedData in Node 2015-11-18 18:03:31 -08:00
Stephen Birarda
3fba1f8445 better variable naming for nodeToKill 2015-11-18 17:46:32 -08:00
Stephen Birarda
f4cf1c0291 only broadcast removed node messages to interested nodes 2015-11-18 17:45:18 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Brad Hefta-Gaub
034debc483 cleanup 2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub
40e69f6946 Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub
d42a1a721f first cut at messages-mixer 2015-11-16 15:26:17 -08:00
Stephen Birarda
584e35e4ab have killNodeWithUUID return success to avoid double lookup 2015-11-16 10:58:11 -08:00
Stephen Birarda
e52e9be44c re-broadcast disconnects from domain-server 2015-11-12 17:23:39 -08:00
Stephen Birarda
1c9396d66e handle disconnect request in domain-server 2015-11-12 15:43:03 -08:00
Stephen Birarda
6d99a822a3 use a case-insensitive search in allowed editors QStringList 2015-10-28 14:33:50 -07:00
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Stephen Birarda
7987595dcd set the bearer poll timeout for wlan scan in Qt 5.5 2015-10-08 11:32:10 -07:00
Stephen Birarda
e835b5ccf3 remove old gnutls code from domain-server 2015-10-05 15:30:26 -07:00
Stephen Birarda
030404157e cleanup Assignment grab from iterator 2015-09-21 11:54:41 -07:00
Stephen Birarda
e21c1cb67c make sure server/mixers are first in FIFO 2015-09-21 11:51:53 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
0037a1f4a7 Win build fix 2015-09-11 14:21:55 +02:00
Atlante45
18a696d88c Type cleanup 2015-09-11 14:21:54 +02:00
Atlante45
15f7745bcc JSON stats reliable and ordered 2015-09-11 14:21:54 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Bennett Goble
6f4fc24fb6 NodeConnectionData QDataStream #include 2015-08-30 12:05:56 -04:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Stephen Birarda
1a019187af Merge branch 'ds-cleanup' into asset-upload 2015-08-26 15:07:43 -07:00
Stephen Birarda
cd7d0f383b allow editors who can't be verified in the short term 2015-08-26 15:07:29 -07:00
Stephen Birarda
4039c2e3e0 fix for asset-server naming, deadlock in timeout/wait 2015-08-26 14:27:12 -07:00
Stephen Birarda
352f3543c3 resolve conflicts on merge with ds-cleanup 2015-08-26 13:33:50 -07:00
Stephen Birarda
c8545c8aeb remove an empty line 2015-08-26 12:37:47 -07:00
Stephen Birarda
dc1f726283 don't assign the asset-server in domain by default 2015-08-26 12:36:48 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Ryan Huffman
4e3d0758e5 Remove UNUSED_2 2015-08-25 15:07:07 -07:00
Stephen Birarda
c776f04ab2 don't allow in a user who should have edit but not verified 2015-08-25 14:36:22 -07:00
Stephen Birarda
9940f375ea repairs for CR comments 2015-08-25 10:02:43 -07:00
Stephen Birarda
d02e5b2450 fix a typo in comment in DomainGatekeeper 2015-08-24 15:10:27 -07:00
Stephen Birarda
a9c04e5116 don't allow verified connection without username 2015-08-24 15:01:39 -07:00
Stephen Birarda
c6f1567361 add a debug for refused connection in DomainGatekeeper 2015-08-24 14:58:25 -07:00
Stephen Birarda
fe591f61cc fix class rename in processConnectRequestPacket 2015-08-24 14:54:48 -07:00
Stephen Birarda
d57c1fc2d5 fix a typo in DomainGatekeeper comment 2015-08-24 14:50:18 -07:00
Stephen Birarda
7591a29c48 add back indentation to STATICALLY_ASSIGNED_NODES 2015-08-24 14:44:24 -07:00
Stephen Birarda
d2acf327dd fix NodeConnectionData discrepancy on request 2015-08-24 14:43:49 -07:00
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
Stephen Birarda
aac15e52bb add explicit cast to double for uptime 2015-08-20 10:19:34 -07:00
Stephen Birarda
74d6e5ba89 make sure LNL goes down before domain-server 2015-08-20 10:01:12 -07:00
Stephen Birarda
2738f65c10 have domain-server report non-skewed uptime 2015-08-19 18:23:11 -07:00
Ryan Huffman
da7c9198c5 Remove superfluous log message 2015-08-19 10:01:40 -07:00
Ryan Huffman
63d0205d1e Move domain settings retrieval to UDT 2015-08-18 23:11:33 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
Leonardo Murillo
7c4813f1cf Another versioning checkpoint + cleanup 2015-08-13 16:35:55 -06:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Bennett Goble
d5691b1196 Add QDataStream include to DomainServerWebSessionData.cpp 
Fixes compilation error with Qt 5.5.0, QDataStream >> QSet
 2015-08-08 17:17:29 -04:00
bwent
ffccc9ca96 clean up formatting, make connectionUUID const in NodeList 2015-08-06 10:11:22 -07:00
bwent
73ea958640 add check if user is local user 2015-08-06 09:01:25 -07:00
bwent
a8f9f9d746 clean-up formatting 2015-08-05 17:43:03 -07:00
bwent
45e3eafce3 Remove ERR_get_error call 2015-08-05 16:00:25 -07:00
bwent
ab2b54a6b2 Add connection token to sign with username when connecting to domain-server 2015-08-05 15:33:59 -07:00
bwent
8868148c94 Parital fix for padding error using RSA_sign and RSA_verify 2015-08-05 14:07:25 -07:00
bwent
fc385d9bc1 debugging 2015-08-05 10:29:30 -07:00
bwent
b9364a47a1 Debug null QUuid being stored in conenctionTokenHash 2015-08-04 15:31:26 -07:00
bwent
54dd5da64c To debug RSA padding error 2015-08-04 12:02:23 -07:00
bwent
af293ec6dd Fix DomainServerConnectionTOken packet writing/resetting 2015-08-04 12:02:23 -07:00
bwent
244cc016ab Generate session token UUIDs to be signed with username 2015-08-04 12:02:23 -07:00
Stephen Birarda
b68c7fd92a first adjustment in NLPacket after type is known 2015-07-23 16:59:08 -07:00
Stephen Birarda
9556fecbe2 initial changes to make _nodeSocket a udt::Socket 2015-07-20 17:10:22 -07:00
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Atlante45
d505527e5a Remove setExtendedheader call 2015-07-17 15:38:36 -07:00
Stephen Birarda
8ff8a17f02 remove TODO added for DS, check sockets 2015-07-17 14:17:48 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
Stephen Birarda
2a2eb39066 repairs for DS path query and response 2015-07-16 17:08:06 -07:00
Stephen Birarda
487969ef7a pack reason size as quint16 2015-07-16 16:45:16 -07:00
Stephen Birarda
f31675c4c6 fix ice-server packets 2015-07-16 14:21:37 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
ccc2649d26 fix packing of domain list header 2015-07-14 21:14:15 -07:00
Stephen Birarda
89c44ded38 repairs for domain-server PacketList sending 2015-07-14 21:01:26 -07:00
Stephen Birarda
a5ca1f7125 fix variable setup in Packet constructor 2015-07-14 19:15:18 -07:00
Atlante45
3abde577e2 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 16:58:26 -07:00
Stephen Birarda
15ca129005 fix for registration of methods with typedef 2015-07-14 16:46:17 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Ryan Huffman
d8bec3983f Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	domain-server/src/DomainServer.cpp
 2015-07-14 16:13:54 -07:00
Stephen Birarda
6d6b9b8117 pass sending node to processListRequestPacket 2015-07-14 16:11:48 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Ryan Huffman
4d9b28688d Update reinterpret_cast call that should be dynamic_cast 2015-07-14 14:49:51 -07:00
Ryan Huffman
84796b20e0 Fix call to constructICEPingReplyPacket 2015-07-14 14:45:45 -07:00
Ryan Huffman
90407e2720 Remove redundant check in if 2015-07-14 14:45:32 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Atlante45
81ad0056c3 Fix a few node deref 2015-07-13 15:34:37 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Stephen Birarda
ede39515d8 update parseData for new network API 2015-07-13 14:26:10 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
e5d8a39dde update DomainServer to new packet receive API 2015-07-13 11:11:52 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Stephen Birarda
d85fbbfb74 update NodeList for new packet receive code 2015-07-10 17:45:23 -07:00
Stephen Birarda
dd30813ae0 remove an extra line in DomainServer 2015-07-09 12:39:43 -07:00
Stephen Birarda
11a4c20a21 fix payloadSize write in DomainServer 2015-07-09 12:23:54 -07:00
Stephen Birarda
cafa8b65f5 specify the size of the DTLS required packet 2015-07-09 12:07:18 -07:00
Stephen Birarda
adf2ce85f1 pack the size of the connection denied reason 2015-07-09 12:03:15 -07:00
Stephen Birarda
a363f42bb2 pass const NLPacket& for all sendUnreliablePacket calls 2015-07-09 11:42:18 -07:00
Stephen Birarda
6cf0018914 repairs required for domain-server build 2015-07-09 11:07:13 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Ryan Huffman
60538d4a82 Merge branch 'atp' of github.com:birarda/hifi into atp 
Conflicts:
	libraries/audio-client/src/AudioIOStats.cpp
 2015-07-07 16:26:22 -07:00
Ryan Huffman
3690ecc28f Add std::move to sendPacket calls 2015-07-07 16:24:11 -07:00
Stephen Birarda
1f68ad892a replace PacketList usage with NLPacketList 2015-07-07 16:14:57 -07:00
Stephen Birarda
bb15326676 repair send of path query packet 2015-07-07 16:02:21 -07:00
Stephen Birarda
6064a2d4e2 CR fixes for DomainServer 2015-07-07 15:21:20 -07:00
Stephen Birarda
ea3f61a0c5 remove use of payload in DomainServer 2015-07-06 17:17:40 -07:00
Stephen Birarda
3fa785c545 fix domain check in packets for new API 2015-07-06 17:03:26 -07:00
Stephen Birarda
33a9a04d9e allow a packet to be created with extended header 2015-07-06 16:18:49 -07:00
Stephen Birarda
57d76f488c make PacketPayload a QIODevice subclass 2015-07-06 11:33:46 -07:00
Stephen Birarda
8dd91b8795 don't force source ID on ICE ping packets 2015-07-02 17:34:52 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
Stephen Birarda
e91ee7e7e3 only send add packet for nodes in interest set 2015-05-29 09:49:54 -07:00
Stephen Birarda
cb7b23f346 install DS message handler in DomainServer 2015-05-28 17:04:15 -07:00
Stephen Birarda
29d3ca85d9 cleanup debug logs for DS/node ping punch 2015-05-28 16:53:13 -07:00
Stephen Birarda
493a9da43e make sure DS log handler is cleaned up 2015-05-28 16:23:14 -07:00
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Stephen Birarda
5c75863af4 immediately send add packet from DS for new node 2015-05-28 10:45:03 -07:00
Stephen Birarda
c7c542ef4c decouple STUN from DS check in 2015-05-27 14:24:15 -07:00
Stephen Birarda
5d9f62066a reload the merged config after making versioned changes 2015-05-21 10:27:24 -07:00
Stephen Birarda
4475ca4643 use new restricting access toggle for DS connection 2015-05-20 16:47:10 -07:00
Stephen Birarda
6306b69ec8 add a version and handle remapping for restricted access 2015-05-20 16:27:53 -07:00
Stephen Birarda
5645fdc8b9 send user to token creation page 2015-05-14 15:21:33 -07:00
Stephen Birarda
4de006f9b9 handle OAuth access token retrieval 2015-05-14 12:22:23 -07:00