Merge branch 'master' of https://github.com/highfidelity/hifi into api-docs

android/docker/Dockerfile

@@ -71,9 +71,13 @@ RUN mkdir "$HIFI_BASE" && \
     mkdir "$HIFI_VCPKG_BASE" && \ 
     mkdir "$HIFI_ANDROID_PRECOMPILED"
 
-RUN git clone https://github.com/jherico/hifi.git && \
+# Checkout a relatively recent commit from the main repository and use it to cache the 
+# gradle and vcpkg dependencies
+# This commit ID should be updated whenever someone changes the dependency list
+# in cmake/ports
+RUN git clone https://github.com/highfidelity/hifi.git && \
     cd ~/hifi && \
-    git checkout quest/build
+    git checkout 796bfb5d6715ff14c2e60f3ee8fac1465b7578c6
 
 WORKDIR /home/jenkins/hifi
 

assignment-client/src/avatars/AvatarMixer.cpp

@@ -83,7 +83,7 @@ AvatarMixer::AvatarMixer(ReceivedMessage& message) :
     packetReceiver.registerListener(PacketType::BulkAvatarTraitsAck, this, "queueIncomingPacket");
     packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
         this, "handleOctreePacket");
-    packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "handleChallengeOwnership");
+    packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "queueIncomingPacket");
 
     packetReceiver.registerListenerForTypes({
         PacketType::ReplicatedAvatarIdentity,
@@ -1136,16 +1136,6 @@ void AvatarMixer::entityChange() {
     _dirtyHeroStatus = true;
 }
 
-void AvatarMixer::handleChallengeOwnership(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
-    if (senderNode->getType() == NodeType::Agent && senderNode->getLinkedData()) {
-        auto clientData = static_cast<AvatarMixerClientData*>(senderNode->getLinkedData());
-        auto avatar = clientData->getAvatarSharedPointer();
-        if (avatar) {
-            avatar->handleChallengeResponse(message.data());
-        }
-    }
-}
-
 void AvatarMixer::aboutToFinish() {
     DependencyManager::destroy<ResourceManager>();
     DependencyManager::destroy<ResourceCacheSharedItems>();

assignment-client/src/avatars/AvatarMixer.h

@@ -65,7 +65,6 @@ private slots:
     void domainSettingsRequestComplete();
     void handlePacketVersionMismatch(PacketType type, const HifiSockAddr& senderSockAddr, const QUuid& senderUUID);
     void handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
-    void handleChallengeOwnership(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void start();
 
 private:

assignment-client/src/avatars/AvatarMixerClientData.cpp

@@ -74,6 +74,9 @@ int AvatarMixerClientData::processPackets(const SlaveSharedData& slaveSharedData
             case PacketType::BulkAvatarTraitsAck:
                 processBulkAvatarTraitsAckMessage(*packet);
                 break;
+            case PacketType::ChallengeOwnership:
+                _avatar->processChallengeResponse(*packet);
+                break;
             default:
                 Q_UNREACHABLE();
         }

assignment-client/src/avatars/MixerAvatar.cpp

@@ -27,13 +27,33 @@
 #include "ClientTraitsHandler.h"
 #include "AvatarLogging.h"
 
-MixerAvatar::~MixerAvatar() {
-    if (_challengeTimeout) {
-        _challengeTimeout->deleteLater();
-    }
+MixerAvatar::MixerAvatar() {
+    static constexpr int CHALLENGE_TIMEOUT_MS = 10 * 1000;  // 10 s
+
+    _challengeTimer.setSingleShot(true);
+    _challengeTimer.setInterval(CHALLENGE_TIMEOUT_MS);
+    
+    _challengeTimer.callOnTimeout(this, [this]() {
+        if (_verifyState == challengeClient) {
+            _pendingEvent = false;
+            _verifyState = verificationFailed;
+            _needsIdentityUpdate = true;
+            qCDebug(avatars) << "Dynamic verification TIMED-OUT for " << getDisplayName() << getSessionUUID();
+        } else {
+            qCDebug(avatars) << "Ignoring timeout of avatar challenge";
+        }
+    });
+
+}
+
+const char* MixerAvatar::stateToName(VerifyState state) {
+    return QMetaEnum::fromType<VerifyState>().valueToKey(state);
 }
 
 void MixerAvatar::fetchAvatarFST() {
+    if (_verifyState >= requestingFST && _verifyState <= challengeClient) {
+        qCDebug(avatars) << "WARNING: Avatar verification restarted; old state:" << stateToName(_verifyState);
+    }
     _verifyState = nonCertified;
 
     _pendingEvent = false;
@@ -80,7 +100,7 @@ void MixerAvatar::fetchAvatarFST() {
 void MixerAvatar::fstRequestComplete() {
     ResourceRequest* fstRequest = static_cast<ResourceRequest*>(QObject::sender());
     QMutexLocker certifyLocker(&_avatarCertifyLock);
-    if (fstRequest == _avatarRequest) {
+    if (_verifyState == requestingFST && fstRequest == _avatarRequest) {
         auto result = fstRequest->getResult();
         if (result != ResourceRequest::Success) {
             _verifyState = error;
@@ -90,11 +110,11 @@ void MixerAvatar::fstRequestComplete() {
             _verifyState = receivedFST;
             _pendingEvent = true;
         }
-        _avatarRequest->deleteLater();
         _avatarRequest = nullptr;
     } else {
-        qCDebug(avatars) << "Incorrect request for" << getDisplayName();
+        qCDebug(avatars) << "Incorrect or outdated FST request for" << getDisplayName();
     }
+    fstRequest->deleteLater();
 }
 
 bool MixerAvatar::generateFSTHash() {
@@ -108,7 +128,7 @@ bool MixerAvatar::generateFSTHash() {
     return true;
 }
 
-bool MixerAvatar::validateFSTHash(const QString& publicKey) {
+bool MixerAvatar::validateFSTHash(const QString& publicKey) const {
     // Guess we should refactor this stuff into a Authorization namespace ...
     return EntityItemProperties::verifySignature(publicKey, _certificateHash,
         QByteArray::fromBase64(_certificateIdFromFST.toUtf8()));
@@ -171,7 +191,9 @@ void MixerAvatar::ownerRequestComplete() {
     QMutexLocker certifyLocker(&_avatarCertifyLock);
     QNetworkReply* networkReply = static_cast<QNetworkReply*>(QObject::sender());
 
-    if (networkReply->error() == QNetworkReply::NoError) {
+    if (_verifyState != requestingOwner) {
+        qCDebug(avatars) << "WARNING: outdated avatar-owner information received in state" << stateToName(_verifyState);
+    } else if (networkReply->error() == QNetworkReply::NoError) {
         _dynamicMarketResponse = networkReply->readAll();
         _verifyState = ownerResponse;
         _pendingEvent = true;
@@ -259,7 +281,6 @@ void MixerAvatar::processCertifyEvents() {
                     }
                     sendOwnerChallenge();
                     _verifyState = challengeClient;
-                    _pendingEvent = true;
                 } else {
                     _verifyState = error;
                     qCDebug(avatars) << "Get owner status - couldn't parse response for" << getSessionUUID()
@@ -273,46 +294,14 @@ void MixerAvatar::processCertifyEvents() {
             break;
         }
 
-        case challengeResponse:
-        {
-            if (_challengeResponse.length() < 8) {
-                _verifyState = error;
-                _pendingEvent = false;
-                break;
-            }
-
-            int avatarIDLength;
-            int signedNonceLength;
-            {
-                QDataStream responseStream(_challengeResponse);
-                responseStream.setByteOrder(QDataStream::LittleEndian);
-                responseStream >> avatarIDLength >> signedNonceLength;
-            }
-            QByteArray avatarID(_challengeResponse.data() + 2 * sizeof(int), avatarIDLength);
-            QByteArray signedNonce(_challengeResponse.data() + 2 * sizeof(int) + avatarIDLength, signedNonceLength);
-
-            bool challengeResult = EntityItemProperties::verifySignature(_ownerPublicKey, _challengeNonceHash,
-                QByteArray::fromBase64(signedNonce));
-            _verifyState = challengeResult ? verificationSucceeded : verificationFailed;
-            _needsIdentityUpdate = true;
-            if (_verifyState == verificationFailed) {
-                qCDebug(avatars) << "Dynamic verification FAILED for " << getDisplayName() << getSessionUUID();
-            } else {
-                qCDebug(avatars) << "Dynamic verification SUCCEEDED for " << getDisplayName() << getSessionUUID();
-            }
-            _pendingEvent = false;
-            break;
-        }
-
         case requestingOwner:
-        case challengeClient:
         {   // Qt networking done on this thread:
             QCoreApplication::processEvents();
             break;
         }
 
         default:
-            qCDebug(avatars) << "Unexpected verify state" << _verifyState;
+            qCDebug(avatars) << "Unexpected verify state" << stateToName(_verifyState);
             break;
 
     }  // close switch
@@ -334,32 +323,45 @@ void MixerAvatar::sendOwnerChallenge() {
     QCryptographicHash nonceHash(QCryptographicHash::Sha256);
     nonceHash.addData(nonce);
     _challengeNonceHash = nonceHash.result();
-
-    static constexpr int CHALLENGE_TIMEOUT_MS = 10 * 1000;  // 10 s
-    if (_challengeTimeout) {
-        _challengeTimeout->deleteLater();
-    }
-    _challengeTimeout = new QTimer();
-    _challengeTimeout->setInterval(CHALLENGE_TIMEOUT_MS);
-    _challengeTimeout->setSingleShot(true);
-    _challengeTimeout->connect(_challengeTimeout, &QTimer::timeout, this, [this]() {
-        if (_verifyState == challengeClient) {
-            _pendingEvent = false;
-            _verifyState = verificationFailed;
-            _needsIdentityUpdate = true;
-            qCDebug(avatars) << "Dynamic verification TIMED-OUT for " << getDisplayName() << getSessionUUID();
-        }
-    });
-    _challengeTimeout->start();
+    _pendingEvent = false;
+    
+    // QTimer::start is a set of overloaded functions.
+    QMetaObject::invokeMethod(&_challengeTimer, static_cast<void(QTimer::*)()>(&QTimer::start));
 }
 
-void MixerAvatar::handleChallengeResponse(ReceivedMessage* response) {
+void MixerAvatar::processChallengeResponse(ReceivedMessage& response) {
     QByteArray avatarID;
-    QByteArray encryptedNonce;
     QMutexLocker certifyLocker(&_avatarCertifyLock);
+    QMetaObject::invokeMethod(&_challengeTimer, &QTimer::stop);
     if (_verifyState == challengeClient) {
-        _challengeResponse = response->readAll();
-        _verifyState = challengeResponse;
-        _pendingEvent = true;
+        QByteArray responseData = response.readAll();
+        if (responseData.length() < 8) {
+            _verifyState = error;
+            qCDebug(avatars) << "Avatar challenge response packet too small, length:" << responseData.length();
+            return;
+        }
+
+        int avatarIDLength;
+        int signedNonceLength;
+        {
+            QDataStream responseStream(responseData);
+            responseStream.setByteOrder(QDataStream::LittleEndian);
+            responseStream >> avatarIDLength >> signedNonceLength;
+        }
+        QByteArray avatarID(responseData.data() + 2 * sizeof(int), avatarIDLength);
+        QByteArray signedNonce(responseData.data() + 2 * sizeof(int) + avatarIDLength, signedNonceLength);
+
+        bool challengeResult = EntityItemProperties::verifySignature(_ownerPublicKey, _challengeNonceHash,
+            QByteArray::fromBase64(signedNonce));
+        _verifyState = challengeResult ? verificationSucceeded : verificationFailed;
+        _needsIdentityUpdate = true;
+        if (_verifyState == verificationFailed) {
+            qCDebug(avatars) << "Dynamic verification FAILED for " << getDisplayName() << getSessionUUID();
+        } else {
+            qCDebug(avatars) << "Dynamic verification SUCCEEDED for" << getDisplayName() << getSessionUUID();
+        }
+
+    } else {
+        qCDebug(avatars) << "WARNING: Unexpected avatar challenge-response in state" << stateToName(_verifyState);
     }
 }

assignment-client/src/avatars/MixerAvatar.h

@@ -9,8 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-// Avatar class for use within the avatar mixer - encapsulates data required only for
-// sorting priorities within the mixer.
+// Avatar class for use within the avatar mixer - includes avatar-verification state.
 
 #ifndef hifi_MixerAvatar_h
 #define hifi_MixerAvatar_h
@@ -20,8 +19,10 @@
 class ResourceRequest;
 
 class MixerAvatar : public AvatarData {
+    Q_OBJECT
 public:
-    ~MixerAvatar();
+    MixerAvatar();
+
     bool getNeedsHeroCheck() const { return _needsHeroCheck; }
     void setNeedsHeroCheck(bool needsHeroCheck = true) { _needsHeroCheck = needsHeroCheck; }
 
@@ -31,15 +32,18 @@ public:
     void setNeedsIdentityUpdate(bool value = true) { _needsIdentityUpdate = value; }
 
     void processCertifyEvents();
-    void handleChallengeResponse(ReceivedMessage* response);
+    void processChallengeResponse(ReceivedMessage& response);
+
+    // Avatar certification/verification:
+    enum VerifyState {
+        nonCertified, requestingFST, receivedFST, staticValidation, requestingOwner, ownerResponse,
+        challengeClient, verified, verificationFailed, verificationSucceeded, error
+    };
+    Q_ENUM(VerifyState)
 
 private:
     bool _needsHeroCheck { false };
-
-    // Avatar certification/verification:
-    enum VerifyState { nonCertified, requestingFST, receivedFST, staticValidation, requestingOwner, ownerResponse,
-        challengeClient, challengeResponse, verified, verificationFailed, verificationSucceeded, error };
-    Q_ENUM(VerifyState);
+    static const char* stateToName(VerifyState state);
     VerifyState _verifyState { nonCertified };
     std::atomic<bool> _pendingEvent { false };
     QMutex _avatarCertifyLock;
@@ -53,12 +57,11 @@ private:
     QString _dynamicMarketResponse;
     QString _ownerPublicKey;
     QByteArray _challengeNonceHash;
-    QByteArray _challengeResponse;
-    QTimer* _challengeTimeout { nullptr };
+    QTimer _challengeTimer;
     bool _needsIdentityUpdate { false };
 
     bool generateFSTHash();
-    bool validateFSTHash(const QString& publicKey);
+    bool validateFSTHash(const QString& publicKey) const;
     QByteArray canonicalJson(const QString fstFile);
     void sendOwnerChallenge();
 

cmake/compiler.cmake

@@ -34,7 +34,7 @@ if (WIN32)
   list(APPEND CMAKE_PREFIX_PATH "${WINDOW_SDK_PATH}")
 
   # /wd4351 disables warning C4351: new behavior: elements of array will be default initialized
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /wd4351")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP${HIFI_MAX_BUILD_CORES} /wd4351")
   # /LARGEADDRESSAWARE enables 32-bit apps to use more than 2GB of memory.
   # Caveats: http://stackoverflow.com/questions/2288728/drawbacks-of-using-largeaddressaware-for-32-bit-windows-executables
   # TODO: Remove when building 64-bit.

cmake/macros/SetPackagingParameters.cmake

@@ -192,12 +192,12 @@ macro(SET_PACKAGING_PARAMETERS)
 
     # shortcut names
     if (PRODUCTION_BUILD)
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface")
+      set(INTERFACE_SHORTCUT_NAME "High Fidelity")
       set(CONSOLE_SHORTCUT_NAME "Console")
       set(SANDBOX_SHORTCUT_NAME "Sandbox")
       set(APP_USER_MODEL_ID "com.highfidelity.console")
     else ()
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION_NO_SHA}")
+      set(INTERFACE_SHORTCUT_NAME "High Fidelity - ${BUILD_VERSION_NO_SHA}")
       set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")
       set(SANDBOX_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}")
     endif ()

domain-server/src/DomainServer.cpp

@@ -1746,8 +1746,8 @@ void DomainServer::nodePingMonitor() {
 }
 
 void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessage> message) {
-    qDebug() << "Received octree data persist message";
     auto data = message->readAll();
+    qDebug() << "Received octree data persist message" << (data.size() / 1000) << "kbytes.";
     auto filePath = getEntitiesFilePath();
 
     QDir dir(getEntitiesDirPath());
@@ -1759,12 +1759,16 @@ void DomainServer::processOctreeDataPersistMessage(QSharedPointer<ReceivedMessag
     QFile f(filePath);
     if (f.open(QIODevice::WriteOnly)) {
         f.write(data);
+#ifdef EXPENSIVE_NETWORK_DIAGNOSTICS
+        // These diagnostics take take more than 200ms (depending on content size),
+        // causing Socket::readPendingDatagrams to overrun its timebox.
         OctreeUtils::RawEntityData entityData;
         if (entityData.readOctreeDataInfoFromData(data)) {
             qCDebug(domain_server) << "Wrote new entities file" << entityData.id << entityData.dataVersion;
         } else {
             qCDebug(domain_server) << "Failed to read new octree data info";
         }
+#endif
     } else {
         qCDebug(domain_server) << "Failed to write new entities file:" << filePath;
     }

interface/CMakeLists.txt

@@ -117,6 +117,7 @@ if (APPLE)
   # configure CMake to use a custom Info.plist
   set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in)
 
+  set(MACOSX_BUNDLE_BUNDLE_NAME "High Fidelity")
   if (PRODUCTION_BUILD)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER com.highfidelity.interface)
   else ()
@@ -151,7 +152,7 @@ elseif (WIN32)
   set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
   configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})
 
-  set(APP_FULL_NAME "High Fidelity Interface")
+  set(APP_FULL_NAME "High Fidelity")
   set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc")
   configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})
 

interface/resources/qml/hifi/audio/Audio.qml

@@ -186,15 +186,6 @@ Rectangle {
                     backgroundOnColor: "#E3E3E3";
                     checked: muted;
                     onClicked: {
-                        if (pushToTalk && !checked) {
-                            // disable push to talk if unmuting
-                            if (bar.currentIndex === 0) {
-                                AudioScriptingInterface.pushToTalkDesktop = false;
-                            }
-                            else {
-                                AudioScriptingInterface.pushToTalkHMD = false;
-                            }
-                        }
                         if (bar.currentIndex === 0) {
                             AudioScriptingInterface.mutedDesktop = checked;
                         }

interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml

@@ -91,6 +91,7 @@ Item {
 
             SimplifiedControls.TextField {
                 id: myDisplayNameText
+                rightGlyph: simplifiedUI.glyphs.pencil
                 text: MyAvatar.displayName
                 maximumLength: 256
                 clip: true