If labor is done as punishment in a socialist society

Good post, but this isn't even necessary to make working a punishment, people tend naturally to want to be productive, giving people opportunities to work and they'll generally take them. Any rehabilitation program in a communist society needs to restrict as few freedoms as necessary to keep everyone safe.