Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 09:12:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87290 commits 17 branches 0 tags 1.1 GiB
Commit graph

1580 commits

Author SHA1 Message Date
Clement
f8e98d2c6a Remove 2 year old migration code 2018-07-30 17:18:32 -07:00
Clement
9e84603ca4 Make proper -v and -h options for interface 2018-07-30 17:18:32 -07:00
Simon Walton
81c8fe6114 Change 'Enable Authentication' to 'Enable Packet Verification' 2018-07-24 17:06:09 -07:00
Simon Walton
3002abeddc Add DS option to turn off packet authentication 2018-07-18 18:22:36 -07:00
Stephen Birarda
499aa4ad13 404 malformed agent script requests, check doc root 2018-07-18 15:22:45 -07:00
Simon Walton
91e8f1f0f8 Ensure 'verifiedUsername' is always lower case 2018-07-02 15:30:58 -07:00
Simon Walton
abda0b2381 Use case-insensitive matching on friends lists in DomainGatekeeper 2018-06-29 18:25:06 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
Stephen Birarda
743cb7c7e8
Merge pull request #13241 from Atlante45/fix/corrupted-backup 
Don't mark backups from domains with no asset server corrupted
 2018-06-11 10:50:16 -07:00
Stephen Birarda
112abc9d7e
Merge pull request #13148 from birarda/feat/new-version-numbers 
add SHA to PR/master version, add build_type (stable/master/pr/dev)
 2018-06-08 14:44:22 -07:00
Clement
caa01aa25e Don't mark Asset-less DS's backups corrupted 
If the DS doesn't choose to run an Asset Server, add an empty
mappings file to the archive so they do not show as corrupted
 2018-05-25 12:31:51 -07:00
Clement
5f41505846 Store big web requests on disk 2018-05-24 17:30:32 -07:00
Clement
e096ff91f6 Explicitely manage HTTPManager lifetime 2018-05-24 17:30:32 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
c3595a3216 pass STABLE_BUILD instead of BUILD_BRANCH through cmake 2018-05-24 12:03:03 -07:00
Stephen Birarda
d1ace7914e make domain server reliably broadcast all node disconnects 2018-05-23 12:56:12 -07:00
Stephen Birarda
8f6600facf remove ICE peers once nodes connect or are killed 2018-05-22 14:21:49 -07:00
Stephen Birarda
666bdb03b7 never re-use node ID during domain connection 2018-05-22 13:47:31 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Simon Walton
2f72b789a3 Fix for null sourceNode use 2018-04-23 12:13:31 -07:00
Simon Walton
3f894fe5fa Merge fix 2018-04-20 11:15:59 -07:00
Simon Walton
ed0fd8c4d2 Merge fix 2018-04-20 11:13:15 -07:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings 
fix some xcode warnings for unnecessary captured this
 2018-04-20 10:30:27 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections 
Fix avatars not coming back when briefly disconnected from avatar mixer
 2018-04-20 09:53:50 -07:00
SimonWalton-HiFi
9d06890aea
Merge branch 'master' into short-id 2018-04-19 10:09:34 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
Simon Walton
01c39d4310 Use NULL_LOCAL_ID in more places, as requested by review 2018-04-18 11:53:47 -07:00
Simon Walton
104788de50 Take out useless noisy message timer 2018-04-04 16:03:56 -07:00
Simon Walton
d05f0600d4 Handle one-time messages outside LogHandler class 
Also change to std::call_once for the file-scope message IDs.
 2018-04-04 15:44:47 -07:00
Ryan Huffman
2546ff91ca Fix nodelist connections not resetting on both ends 
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
 2018-04-04 11:53:05 -07:00
Stephen Birarda
3a8c9de4fb fix some xcode warnings for unnecessary captured this 2018-04-04 10:38:32 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Simon Walton
efb1fdbc0d Local IDs - add an explicit null value, use it for replicated packets 2018-03-30 18:29:26 -07:00
Simon Walton
1b0b280f3a Fix SequenceNumberStats, misc. clean-up 2018-03-29 10:47:11 -07:00
Simon Walton
b409e04734 Handle all case of nodes being deleted from nodelist 
Delete erased nodes from local ID mapping, as this uses
SharedPointer. Don't keep the mapping from local IDs
to UUIDs in GateKeeper as it isn't used.
 2018-03-28 17:42:23 -07:00
Clement
cb07fc47dc Fix ESS remote method calls for connect only users 2018-03-28 14:01:03 -07:00
Simon Walton
f823f63211 Add domain local ID to DomainServerList 
Also handle domain local ID for 'domain sourced' packets;
bump packet version.
 2018-03-28 13:27:43 -07:00
Simon Walton
bed4033554 Local node IDs now working correctly 
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
 2018-03-27 18:18:14 -07:00
Simon Walton
d3464378b7 Short local source IDs - checkpoint 
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
 2018-03-27 13:46:58 -07:00
Simon Walton
4ec77e3af6 WIP - assign short IDs to nodes and distribute them. 2018-03-26 14:57:59 -07:00
Simon Walton
b5f165d481 Store a short ID with the Node on the domain-server side 2018-03-23 16:55:19 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
Ryan Huffman
5485f60677 Add removal of old consolidated backups 2018-03-22 10:23:18 -07:00
Ryan Huffman
dc694fb0b7 Update content backup downloads to be asynchronous 
Previously backups would be consolidated into a full .zip when the
backup was requested. Because of the potential for a large number of
assets, this could take awhile, causing a browser to fail due to timeout
before the backup was available. This change splits the download
endpoint into 2 parts - one to request information about a backup and
possibly kick off a consolidation, and another to request the actual
file once the consolidate backup is available.
 2018-03-21 15:02:38 -07:00
Ryan Huffman
3a98cf284f Fix DS not handling lowercase header keys 2018-03-16 14:30:03 -07:00
Ryan Huffman
d140ccb790 Fix constexpr compile error on Windows 2018-03-15 14:52:15 -07:00
Ryan Huffman
9275fe1f7d Update backup downloads to use .content.zip extension 2018-03-15 12:47:51 -07:00
Ryan Huffman
bee8899c46 Add support for uploading .content.zip files 2018-03-15 12:17:21 -07:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65 
merge back RC65 to master after RC hotfixes
 2018-03-07 17:22:41 -08:00
John Conklin II
e0a11271bf
Merge pull request #12573 from birarda/bug/domain-settings-metaverse 
fix for getSetting QVariant ref in DomainServer
 2018-03-07 12:11:45 -08:00
Stephen Birarda
a83b54e10d fix for getSetting QVariant ref in DomainServer 2018-03-06 13:55:50 -08:00
Atlante45
a23884d0e0 Prevent crash during long backup web requests 2018-03-06 13:21:02 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00
Stephen Birarda
2af0e5fc2b
Merge pull request #12501 from huffman/feat/content-settings 
Code review changes
 2018-02-26 17:58:08 -07:00
Ryan Huffman
ec210e1750 Move OctreeUtils to OctreeDataUtils 2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d Add RawEntityData subclass 2018-02-26 16:32:09 -08:00
Stephen Birarda
f13412dd56
Merge pull request #12500 from birarda/feat/content-settings 
fixes for comments from code reviews
 2018-02-26 17:12:30 -07:00
Atlante45
8580d181ce Change refresh threshold to 5 minutes. 2018-02-26 15:40:57 -08:00
Ryan Huffman
975bfa6809 Clean up std::chrono usage in DomainContentBackupManager 2018-02-26 15:39:33 -08:00
Ryan Huffman
f23f751e80 Add check to make sure entity data gets written to zip 2018-02-26 15:27:24 -08:00
Atlante45
3592fcf3c2 CR 2018-02-26 14:52:27 -08:00
Stephen Birarda
2872412f9c fixes for comments from code reviews 2018-02-26 14:35:34 -08:00
Ryan Huffman
cd9cdea3e8 Update backup formats to filter out non-whitelisted characters 2018-02-26 14:29:13 -08:00
Ryan Huffman
dbfbee5406 CR 2018-02-26 13:53:20 -08:00
Stephen Birarda
4c44bcfdba
Merge pull request #12487 from Atlante45/feat/backups-integration 
Actually remove Backup from list during delete
 2018-02-22 20:22:43 -07:00
Atlante45
eeda07bba6 Actually remove Backup from list during delete 2018-02-22 19:19:39 -08:00
Stephen Birarda
32830cbcd3
Merge pull request #12486 from Atlante45/feat/backups-integration 
Never delete assets on load
 2018-02-22 19:49:19 -07:00
Clément Brisset
0e5e63bf03
Merge pull request #12481 from birarda/feat/content-settings 
immediately show restore, set restore filename, cleanup old AS baked content on start
 2018-02-22 18:41:13 -08:00
Atlante45
cbabca5e3e Add loadingComplete callback 2018-02-22 18:36:36 -08:00
Atlante45
e5c501a4cd Never delete assets on load 2018-02-22 18:36:22 -08:00
Atlante45
acf04830ee Remove deleted file from the _assetsOnDisk set 2018-02-22 17:43:04 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Stephen Birarda
3e4375b1e6 set recovery filename during domain content archive recovery 2018-02-22 16:54:56 -08:00
Atlante45
80c0f2a21e Fix crash when passing --checkMinSpec flag 
That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
 2018-02-22 16:29:38 -08:00
Stephen Birarda
3c39c92879
Merge pull request #12468 from huffman/fix/reject-invalid-manual-backup-names 
Fix/reject invalid manual backup names
 2018-02-22 12:17:42 -07:00
Ryan Huffman
017d10de3d Fix DomainContentBackupManager.* headers 2018-02-22 09:29:59 -08:00
Ryan Huffman
bf4fd867a3 Add rejection for invalid manual backup names 2018-02-22 09:29:18 -08:00
Atlante45
2fb9c324a5 Ignore baked assets in backups 2018-02-21 18:40:06 -08:00
Clément Brisset
8f7944522f
Merge pull request #12465 from birarda/feat/content-settings 
fix restore of object settings for content or domain settings
 2018-02-21 18:15:09 -08:00
Stephen Birarda
af3970e211
Merge pull request #12466 from Atlante45/feat/backups-integration 
Fix crash on manual upload recovery
 2018-02-21 19:13:56 -07:00
Clément Brisset
bbade00f3d
Merge pull request #12434 from birarda/feat/reload-after-restore 
check for recovery complete always, reload content page on restore
 2018-02-21 18:12:37 -08:00
Stephen Birarda
a036de9687 fix restore of object settings 2018-02-21 18:12:00 -08:00
Atlante45
a2c94bd9d2 Fix invalid iterator access 2018-02-21 18:08:21 -08:00
Atlante45
e12ca2683f Fix incorrect "all backups loaded" flag 2018-02-21 18:08:21 -08:00
Stephen Birarda
e967ed0e22
Merge pull request #12459 from Atlante45/feat/backups-integration 
Cleanup timers on the correct thread
 2018-02-21 18:55:39 -07:00
Stephen Birarda
946474c615 do not init caching for asset requests in domain-server 2018-02-21 16:33:58 -08:00
Atlante45
7582395686 Cleanup backup handlers timers on the correct thread 2018-02-21 14:53:04 -08:00
Atlante45
0c7f5250f3 Update isCorrupted with name indexing 2018-02-20 11:48:25 -08:00
Ryan Huffman
479dfaf330 Add corrupted backup status to domain content backup info 2018-02-20 10:18:12 -08:00
Stephen Birarda
3f75bf62d5 check for recovery complete always, reload content page on restore 2018-02-16 18:03:16 -08:00
Atlante45
85c1739df4 Fix filename not being passed in correctly 2018-02-16 17:37:29 -08:00
Stephen Birarda
1e36a5b218
Merge pull request #12430 from birarda/feat/pending-content-archives 
make filename regex less restrictive
 2018-02-16 18:21:56 -07:00
Atlante45
c61aa4bf95 Pass in backup name to handler 2018-02-16 17:16:31 -08:00
Stephen Birarda
2faa67c68d make filename regex less restrictive 2018-02-16 17:01:46 -08:00
Atlante45
acc68d65c2 Backup bug fixes 2018-02-16 16:59:12 -08:00
Stephen Birarda
4c10dcba96 match previous behavior in DomainGatekeeper 2018-02-16 16:06:29 -08:00
Stephen Birarda
9057918e08 move default security permissions to describe-settings.json 2018-02-16 16:01:40 -08:00
Stephen Birarda
dd5b08bdc1 fix unlock of locker not mutex, don't pack permission defaults 2018-02-16 16:01:40 -08:00
Stephen Birarda
1c053730eb make DomainServerSettingsManager thread-safe for use in content backup 2018-02-16 16:01:40 -08:00
Stephen Birarda
d9f2e1986f set DomainContentBackupManager object name so it appears on thread 2018-02-16 16:01:40 -08:00
Stephen Birarda
8e621a95a3 fix typo in debug for writing new entities 2018-02-16 16:01:40 -08:00
Stephen Birarda
441b55301f cleanup LNL last during DS shutdown 2018-02-16 16:01:40 -08:00
Stephen Birarda
494f93304b take down AssetClient after content manager 2018-02-16 16:01:40 -08:00
Stephen Birarda
faacd986b3 remove deleted backups from content archives tables 2018-02-16 16:01:40 -08:00
Stephen Birarda
40078450dd add API to recover from content archive 2018-02-16 16:01:40 -08:00
Stephen Birarda
de75fe8e9f CR fix for typo in comment 2018-02-16 15:37:14 -08:00
Stephen Birarda
2020ce5907 add API to recover from content archive 2018-02-16 15:37:14 -08:00
Stephen Birarda
6f8381d378 use automatic content archives group const 2018-02-16 15:34:55 -08:00
Stephen Birarda
910f3425f8 fix latest backup refreshing with no caching 2018-02-16 15:34:55 -08:00
Stephen Birarda
b019895fce handle entity file upload from new content upload 2018-02-16 15:34:55 -08:00
Stephen Birarda
dd5a705836 move rolling interval backup rules to automatic content archives 2018-02-16 15:34:55 -08:00
Ryan Huffman
f4cde44e6a Fix indentation of brace initialization 2018-02-16 15:25:29 -08:00
Ryan Huffman
a2072062f1 Fix recovery filename not being reset when recovery complete 2018-02-16 14:33:37 -08:00
Ryan Huffman
41d7d7efbb Fix initializer list style 2018-02-16 14:33:19 -08:00
Ryan Huffman
936629ec1a Update DomainContentBackupManager to use emplace_back where available 2018-02-16 14:13:12 -08:00
Ryan Huffman
0230abea79 Fix backup loading not getting auto backups 2018-02-16 13:54:35 -08:00
Ryan Huffman
ec3580f596 Fix recovery ID not being recorded 2018-02-16 13:08:57 -08:00
Ryan Huffman
efa55c0a63 Update backup delete to not break rolling backups and remove unused asset files 2018-02-16 13:07:17 -08:00
Stephen Birarda
29349d7bb2 fix for isAvailable boolean in AssetsBackupHandler 2018-02-15 19:18:51 -08:00
Stephen Birarda
4bb8435ef8 don't overwrite general description object with filtered one 2018-02-15 19:18:22 -08:00
Stephen Birarda
81662b5edc don't overwrite general description object with filtered one 2018-02-15 19:14:14 -08:00
Atlante45
b30f98d541 CR 2018-02-15 18:20:14 -08:00
Atlante45
697f0c443c Fix warning 2018-02-15 17:43:02 -08:00
Atlante45
2b85634a21 Fix build error 2018-02-15 17:03:55 -08:00
Atlante45
cae3e0a9dc Add status func to ContentSettingsBackupHandler 2018-02-15 17:00:24 -08:00
Atlante45
771e4cd9f4 Hook up status and progress 2018-02-15 16:48:21 -08:00
Atlante45
57410e4f1c Remove ES restart after restore 2018-02-15 16:48:21 -08:00
Atlante45
b76e1b9750 Add backup status getters 2018-02-15 16:48:21 -08:00
Atlante45
a7ca539899 Simplify BackupHandler pattern 2018-02-15 16:48:21 -08:00
Ryan Huffman
1120b12b8c Fix argument to isAvailable 2018-02-15 16:47:48 -08:00
Ryan Huffman
2942a53a1d Add recovery mode and full backup information to DS 2018-02-15 16:47:48 -08:00
Ryan Huffman
dd0b8a0c2f Add backup download API to DS 2018-02-15 16:47:23 -08:00
Ryan Huffman
9e99c5c744 Add restart of ES during backup recovery 2018-02-15 16:47:23 -08:00
Stephen Birarda
e71f2fa387 use QtHelpers macro for blocking invoke 2018-02-15 16:03:03 -08:00
Stephen Birarda
e06c95f586 make settings manager methods used for backup/restore thread safe 2018-02-15 15:55:13 -08:00
Stephen Birarda
f5cad5683d make sure backup handlers end up on the correct thread 2018-02-15 15:39:25 -08:00
Stephen Birarda
f624e1b464 add a content settings backup handler 2018-02-15 15:10:51 -08:00
Atlante45
3297e39c14 CR 2018-02-15 13:39:18 -08:00
Atlante45
d6e2814081 Write assets to disk when recovering full backup 2018-02-15 11:28:52 -08:00
Atlante45
9fca92facd Move EntitiesBackupHandler to its own file 2018-02-15 11:28:52 -08:00
Atlante45
d8d05fe045 Rename backup supervisor 2018-02-15 11:27:21 -08:00
Atlante45
4482f9c83c Queue all requests until the AS is fully setup 2018-02-15 11:27:21 -08:00
Atlante45
ce93b9a1f4 Simplify BackupHandler pattern 2018-02-15 11:27:20 -08:00
Ryan Huffman
efb2473fcf Updaet createManualBackup to defer response until creation is done 2018-02-15 11:02:55 -08:00
Ryan Huffman
df809f5a3e Cleanup logging for backup cleanup 2018-02-15 11:02:29 -08:00
Ryan Huffman
4b2e907ada Update entities recover backup to reset id and version 2018-02-15 11:02:14 -08:00
Ryan Huffman
1aba89b908 Fix style of init list 2018-02-15 10:22:35 -08:00
Ryan Huffman
b832e118cc Add 'override' to BackupHandler methods 2018-02-15 10:22:35 -08:00
Ryan Huffman
f2b6823748 Fix initializer in EntitiesBackupHandler 2018-02-15 10:22:35 -08:00
Ryan Huffman
b6240e8622 Move backup recover API to POST 2018-02-15 10:22:35 -08:00
Ryan Huffman
8a69c69bec CR 2018-02-15 10:22:35 -08:00
Ryan Huffman
80b03b9046 Make backup directory in content manager const 2018-02-15 10:22:35 -08:00
Ryan Huffman
dd398da2e0 Update DS to use promises for backup APIs 2018-02-15 10:22:35 -08:00
Ryan Huffman
8b07e7e28f Add backup DS APIs 
Add backup apis
 2018-02-15 10:22:35 -08:00
Ryan Huffman
e63b692d80 Add BackupHandler for entity file backups 2018-02-15 10:22:35 -08:00
Atlante45
69298246c4 CR 2018-02-15 10:09:21 -08:00
Atlante45
d4b4c55673 Remove unecessary debug 2018-02-15 10:09:21 -08:00
Atlante45
c41ad1a699 Add consolidate 2018-02-15 10:09:21 -08:00
Atlante45
a6447da64c More Asset Backup work 2018-02-15 10:09:21 -08:00
Atlante45
11b7fb89a9 Integrate new backup systems 2018-02-15 10:09:21 -08:00
Ryan Huffman
0bbbff95cd Fix replacement octree data not working 2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60 Cleanup entity -> ds persist 2018-02-15 10:09:21 -08:00
Ryan Huffman
ff5be2d690 Fix entity data ID sometimes being reset 2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030 Add entity file sync and domain content backups 2018-02-15 10:09:20 -08:00
Stephen Birarda
37b8fa2c0c put back default values in settings response 2018-02-14 12:09:57 -08:00
Stephen Birarda
3516a8939a flag settings in description as being excluded from backups 2018-02-14 12:09:57 -08:00
Stephen Birarda
09c2390db4 change backup file name, fix safari button click bug 2018-02-14 12:09:57 -08:00
Stephen Birarda
11fe279f6f add domain settings backup and restore to web interface 2018-02-14 12:09:57 -08:00
Stephen Birarda
0ace92798d repair 2.1 settings migration code for avatar height 2018-02-14 12:09:57 -08:00
Stephen Birarda
b0967dfc3a move some more settings to content, leave places in domain settings 2018-02-14 12:09:57 -08:00
Stephen Birarda
6240181474 initial separation of content settings and domain settings 2018-02-14 12:09:56 -08:00
Atlante45
e15ab2ca6c CR 2018-02-12 13:32:48 -08:00
Atlante45
46449256ce CR 2018-02-09 11:38:46 -08:00
Atlante45
87f77b6257 Asset Server Backup 2018-02-09 11:32:42 -08:00
Stephen Birarda
7a21ae8d89 re-send a connection token packet if the current one is null 2018-02-02 15:25:43 -08:00
Stephen Birarda
98d581acd1 fix debug lines in DomainGatekeeper with extra parens 2018-02-02 13:47:48 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -08:00
Thijs Wenker
1bfb62bd7f list assignment types in assignment-client help 2017-12-18 15:32:32 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Anthony J. Thibault
d1609fb964 domain-server warning fix 2017-11-28 17:48:34 -08:00
Stephen Birarda
e2082c0bcf apply machine fingerprint permissions if username absent 2017-11-27 19:02:40 -08:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00
Atlante45
b398e235a2 Add tmpRezCertified to default perms 2017-11-22 13:40:44 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -08:00
John Conklin II
a4e6b2911d
Merge pull request #11734 from highfidelity/stable 
Make sure RC-58 is up to date with stable
 2017-11-02 16:39:27 -07:00
Atlante45
7616fe193c Migrate the DS config version to the config file 2017-10-31 17:35:23 -07:00
Stephen Birarda
b8370128ce remove master config from HifiConfigVariantMap/domain-server 2017-10-31 16:19:50 -07:00
Stephen Birarda
05cfd72464
Merge pull request #11707 from Atlante45/feat/wizard 
Domain Settings tweaks + Domain Setup Wizard
 2017-10-30 08:39:31 -07:00
Ryan Huffman
ed99541b5f Fix domain info not loading for temp domains in DS settings 2017-10-29 20:47:52 -07:00
Atlante45
b0d838cb9b Fix UNIX warning 2017-10-28 14:57:16 -07:00
Ryan Huffman
88e22f7507 Remove unneeded logging in DomainServer.cpp 2017-10-28 14:19:14 -07:00
Atlante45
56e9a9aaf9 Handle old configs 2017-10-27 17:32:11 -07:00
Ryan Huffman
c42ef4f88c Update most DS API forwarding APIs to use a single forwarding function 2017-10-27 15:53:50 -07:00
Atlante45
203a419f2a Setup Wizard 2017-10-27 12:52:36 -07:00
Ryan Huffman
2944d76ef0 Update settings with auto domain creation and restart 2017-10-27 11:49:41 -07:00
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